diff -u -rN hengband/lib/edit/m_info.txt hengband-g/lib/edit/m_info.txt --- hengband/lib/edit/m_info.txt Fri Nov 15 23:24:12 2002 +++ hengband-g/lib/edit/m_info.txt Mon Jun 14 18:39:34 2004 @@ -3703,3 +3703,68 @@ # Crusade R:9:0 + +### Gold Mage ### +N:27 +I:SORCERY:INT:0x05:0:1:430 +# Life +R:0:0 + +# Sorcery +R:1:1 +T:1:1:23:4 #0 +T:1:2:24:4 +T:3:3:25:1 +T:3:3:30:1 +T:4:4:30:1 +T:5:5:35:5 +T:6:5:30:4 +T:7:7:75:9 +T:9:7:75:8 #1 +T:10:7:75:8 +T:11:7:75:7 +T:13:7:50:6 +T:18:12:60:8 +T:22:12:60:8 +T:28:20:70:15 +T:33:30:75:20 +T:3:3:25:15 #2 +T:10:10:80:40 +T:14:10:60:25 +T:18:30:70:40 +T:20:18:85:50 +T:20:18:60:25 +T:25:25:75:19 +T:40:40:80:100 +T:10:10:40:20 #3 +T:20:20:80:100 +T:25:25:75:70 +T:30:40:80:120 +T:33:35:60:100 +T:42:50:90:175 +T:43:40:55:200 +T:99:0:0:0 + +# Nature +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 -u -rN hengband/lib/edit/s_info.txt hengband-g/lib/edit/s_info.txt --- hengband/lib/edit/s_info.txt Fri Nov 15 23:24:13 2002 +++ hengband-g/lib/edit/s_info.txt Mon Jun 14 17:36:49 2004 @@ -8967,3 +8967,335 @@ S:0:0:7000 # SUDE S:1:4000:8000 # NITOURYU S:2:0:0 # RIDING + +### GOLD MAGE ### +N:27 +# Bow +W:0:0:0:1 # 0 +W:0:1:0:1 # +W:0:2:0:1 # 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:0:1 # 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:0: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:0:1 # DAGGER +W:4:5:0:1 # MAIN_GAUCHE +W:4:6:0:1 # 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:4 # 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 -u -rN hengband/lib/edit/t0000001.txt hengband-g/lib/edit/t0000001.txt --- hengband/lib/edit/t0000001.txt Sun Nov 30 07:19:37 2003 +++ hengband-g/lib/edit/t0000001.txt Tue Jun 15 16:02:19 2004 @@ -82,7 +82,7 @@ F:!:FLOOR:3:0:70 # Ring of Warning -?:[AND [EQU $QUEST1 3] [EQU $CLASS Mage High-Mage Blue-Mage Sorcerer Mirror-Master] ] +?:[AND [EQU $QUEST1 3] [EQU $CLASS Mage High-Mage Blue-Mage Sorcerer Mirror-Master Gold-Mage] ] F:b:BUILDING_1:3:0:0:0:0:NONE:14 F:!:FLOOR:3:0:618 @@ -429,6 +429,13 @@ ?:[AND [EQU $QUEST27 3] [EQU $CLASS Imitator] ] F:a:BUILDING_0:3 F:@:FLOOR:3:0:0:0:220 + +# Quest 27 rewarding (Gold-Mage +# get a Rod of Healing) +# well, the reward is not an artifact, but who cares? +?:[AND [EQU $QUEST27 3] [EQU $CLASS Gold-Mage] ] +F:a:BUILDING_0:3 +F:@:FLOOR:3:0:374 # Quest 27 finished, no new quest is available ?:[EQU $QUEST27 4] diff -u -rN hengband/lib/edit/t0000002.txt hengband-g/lib/edit/t0000002.txt --- hengband/lib/edit/t0000002.txt Sun Nov 30 06:06:29 2003 +++ hengband-g/lib/edit/t0000002.txt Mon Jun 14 18:02:34 2004 @@ -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: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:0 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: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:0 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: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:0 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: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:0 D:###################################################################################################################################################################################################### D:#---------------------TTTT-------------------------------------------------------------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT# diff -u -rN hengband/lib/edit/t0000003.txt hengband-g/lib/edit/t0000003.txt --- hengband/lib/edit/t0000003.txt Sun Nov 30 06:06:29 2003 +++ hengband-g/lib/edit/t0000003.txt Mon Jun 14 18:05:08 2004 @@ -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: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:0 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: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:0 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: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:0 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: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:0 B:$13:N:Trump Tower:Pelloi:Amberite B:13:N:トランプ魔術の塔:ペロイ:アンバライト diff -u -rN hengband/lib/edit/t0000004.txt hengband-g/lib/edit/t0000004.txt --- hengband/lib/edit/t0000004.txt Sun Nov 30 06:06:29 2003 +++ hengband-g/lib/edit/t0000004.txt Mon Jun 14 18:20:15 2004 @@ -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: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:$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: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:0 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: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:0 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: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:0 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: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:0 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: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:0 B:$13:N:Trump Tower:Colleuse:Amberite B:13:N:トランプ魔術の塔:コレウス:アンバライト diff -u -rN hengband/lib/edit/t_lite.txt hengband-g/lib/edit/t_lite.txt --- hengband/lib/edit/t_lite.txt Sun Nov 30 07:19:37 2003 +++ hengband-g/lib/edit/t_lite.txt Tue Jun 15 16:04:07 2004 @@ -96,7 +96,7 @@ F:!:FLOOR:3:0:70 # Ring of Warning -?:[AND [EQU $QUEST1 3] [EQU $CLASS Mage High-Mage Blue-Mage Sorcerer Mirror-Master] ] +?:[AND [EQU $QUEST1 3] [EQU $CLASS Mage High-Mage Blue-Mage Sorcerer Mirror-Master Gold-Mage] ] F:b:BUILDING_1:3:0:0:0:0:NONE:2 F:!:FLOOR:3:0:618 @@ -363,6 +363,13 @@ F:b:BUILDING_1:3:0:0:0:0:NONE:15 F:!:FLOOR:3:0:0:0:220 +# Quest 27 rewarding (Gold-Mage +# get a Rod of Healing) +# well, the reward is not an artifact, but who cares? +?:[AND [EQU $QUEST27 3] [EQU $CLASS Gold-Mage] ] +F:b:BUILDING_1:3:0:0:0:0:NONE:15 +F:!:FLOOR:3:0:374 + # Quest 27 finished, continue with quest 15 ?:[EQU $QUEST27 4] F:b:BUILDING_1:3:0:0:0:0:NONE:15 @@ -590,8 +597,8 @@ B:6:A:0:武器を強化する:400:800:w:23:0 B:$6:A:1:Enchant armor:300:600:a:24:0 B:6:A:1:防具を強化する:300:600:a:24:0 -B:$6: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:6: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:$6: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:6: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:N:Temple of Life:Crysania:Human B:7:N:生命魔術の塔:クリサニア:人間 @@ -608,8 +615,8 @@ B:8:A:1:一泊する:0:100:r:17:0 B:$8:A:2:Identify possessions:100:2000:i:26:0 B:8:A:2:持ち物全てを鑑定:100:2000:i:26:0 -B:$8: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:8: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:$8: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:0 +B:8: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:0 B:$9:N:Archers Guild:Trallin:Half-elf B:9:N:アーチャーのギルド:トゥラリン:ハーフエルフ @@ -617,8 +624,8 @@ B:9:A:0:矢や石等を強化する:20:40:a:30:0 B:$9:A:1:Enchant bow:400:800:b:31:0 B:9:A:1:弓を強化する:400:800:b:31:0 -B:$9: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:9: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:$9: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:0 +B:9: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:0 B:$10:N:Paladins Guild:Langordathur:Human B:10:N:パラディンのギルド:ランゴルダスール:人間 @@ -626,8 +633,8 @@ B:10:A:0:防具を強化する:300:600:a:24:0 B:$10:A:1:See Healers:0:200:h:28:0 B:10:A:1:治療家に会う:0:200:h:28:0 -B:$10: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:10: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:$10: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:0 +B:10: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:0 B:$11:N:Tower of Sorcery:Tanistil:Elf B:11:N:仙術の塔:タニスティル:エルフ diff -u -rN hengband/lib/help/editor.txt hengband-g/lib/help/editor.txt --- hengband/lib/help/editor.txt Thu Dec 4 23:55:53 2003 +++ hengband-g/lib/help/editor.txt Mon Jun 14 20:16:28 2004 @@ -322,7 +322,7 @@ Tourist, Imitator, BeastMaster, Sorcerer, Archer, Magic-Eater, Bard, Red-Mage, Samurai, ForceTrainer, Blue-Mage, Cavalry, Berserker, Weaponsmith, Mirror-Master, - Ninja + Ninja, Gold-Mage $PLAYER Returns player name. diff -u -rN hengband/lib/help/jeditor.txt hengband-g/lib/help/jeditor.txt --- hengband/lib/help/jeditor.txt Fri Dec 5 15:18:03 2003 +++ hengband-g/lib/help/jeditor.txt Mon Jun 14 20:16:44 2004 @@ -553,7 +553,7 @@ Chaos-Warrior, Monk, Mindcrafter, High-Mage, Tourist, Imitator, BeastMaster, Sorcerer, Archer, Magic-Eater, Bard, Red-Mage, Samurai, ForceTrainer, Blue-Mage, Cavalry, Berserker, Weaponsmith, - Mirror-Master, Ninja + Mirror-Master, Ninja, Gold-Mage のどれか $PLAYER diff -u -rN hengband/lib/help/jmagic.txt hengband-g/lib/help/jmagic.txt --- hengband/lib/help/jmagic.txt Sat May 3 17:54:17 2003 +++ hengband-g/lib/help/jmagic.txt Thu Jun 17 23:22:31 2004 @@ -50,6 +50,7 @@ 観光客 | | | | | | | 1 | | | 魔獣使い | | | | | | 1 | | | | 練気術師 | 1 | | 1 | | 1 | | | 1 | | 1 +金魔道師 | | 1 | | | | | | | | スペルマスター| 全ての魔法領域 赤魔道師 | 全ての魔法領域(下位魔法書のみ) diff -u -rN hengband/lib/help/jraceclas.txt hengband-g/lib/help/jraceclas.txt --- hengband/lib/help/jraceclas.txt Sun Nov 16 23:42:05 2003 +++ hengband-g/lib/help/jraceclas.txt Thu Jun 17 23:23:14 2004 @@ -417,7 +417,7 @@ ***** === 職業 === -変愚蛮怒には２７の職業があり、各々に長所と短所およびキャラクターの能 +変愚蛮怒には２８の職業があり、各々に長所と短所およびキャラクターの能 力への補正があります。多くの職業にはまた固有の能力があります。それらは 往々にしてレベルに依存し、ゲーム後半にならないと使えないものもありま す。 @@ -910,6 +910,19 @@ ていきます。彼らはクラスパワー「速駆け」を使用する事で通常よりも遥 かに速く走る事ができます。 +***** +--- 金魔道師 --- + + 金魔道師はお金こそ全てだと信じる魔法使いです。魔力を使って硬貨を投 + げることによって敵を攻撃し、より金持ちになるべくその死体を宝に変換 + します。他の魔法使いと同じくらい魔法が得意ですが、お金のことばかり + 考えているので魔法防御はみじめなほど悪いです。魔法に必要な能力は知 + 能です。 + + 金魔道師は仙術の魔法を使うことができます。ただし無傷球を除きます。 + 彼らはクラスパワー「銭投げ」と「強欲」を持っています。「銭投げ」は + お金を消費して敵を攻撃します。「強欲」はユニークモンスターの死体か + ら高級なアイテムを作り出します。 ***** @@ -1093,6 +1106,7 @@ 鍛冶師 +3 -1 -1 +1 +0 -1 +6 +30% 鏡使い -2 +3 +1 -1 -2 +1 +2 +30% 忍者 +0 -1 -1 +3 +2 -1 +2 +20% +金魔道師 -4 +2 -2 -1 -2 +4 +0 +30% --- Table 3 - Personality Statistic Bonus Table --- @@ -1191,6 +1205,7 @@ 鍛冶師 30+10 28+10 28+10 1 20 10 60+21 45+15 鏡使い 30+10 33+11 40+12 3 14 16 34+6 30+10 忍者 45+15 24+10 36+10 8 48 32 70+25 66+18 +金魔道師 20+7 40+15 -inf 2 12 2 34+6 20+7 各職業の技能値を示す 2つの数値は初期技能と10レベルあたりの上昇速度を示 しています。例えば、戦士の解除技能は 25+12 ですから、30レベルに到達し diff -u -rN hengband/lib/help/magic.txt hengband-g/lib/help/magic.txt --- hengband/lib/help/magic.txt Mon Jan 19 20:10:55 2004 +++ hengband-g/lib/help/magic.txt Tue Jun 15 12:41:43 2004 @@ -55,6 +55,7 @@ | | | | | | | 1 | | | | | | | | | | 1 | | | | | ForceTrainer | 1 | | 1 | | 1 | | | 1 | | 1 | +Gold-Mage | | 1 | | | | | | | | | Sorcerer | All realms Red Mage | All realms (Lower rank spellbooks only) diff -u -rN hengband/lib/help/raceclas.txt hengband-g/lib/help/raceclas.txt --- hengband/lib/help/raceclas.txt Sun Nov 16 23:42:05 2003 +++ hengband-g/lib/help/raceclas.txt Tue Jun 15 22:00:36 2004 @@ -462,7 +462,7 @@ ***** === The Classes === -There are twenty seven different classes that you can choose from in +There are twenty eight different classes that you can choose from in Hengband. Each class has various strengths and weaknesses and its own adjustments to a character's stats and abilities. Many classes also have intrinsic abilities and powers. These are often linked to the @@ -987,6 +987,21 @@ class power - 'Quick Walk' - which makes their walking speed extremely fast. +***** +---Gold-Mage --- + + Gold-Mages are mages who believe money is everything. They attack + their enemy by throwing coins magically at it, then convert its + corpse into treasure to be richer. They are as good at magic as + other mages, but their saving throw is miserably poor because + their mind is filled with money. Intelligence determines their + spell casting ability. + + Gold-Mages can cast Sorcery magic spells except Globe of + Invulnerability. They have two class powers - 'Throw Coins', + which consumes some of your money to attack your enemy; and + 'Greed', which makes a great item from the corpse of a unique + monster. ***** @@ -1175,6 +1190,7 @@ Weaponsmith +3 -1 -1 +1 +0 -1 +6 +30% Mirror-Master -2 +3 +1 -1 -2 +1 +2 +30% Ninja +0 -1 -1 +3 +2 -1 +2 +20% +Gold-Mage -4 +2 -2 -1 -2 +4 +0 +30% --- Table 3 - Personality Statistic Bonus Table --- @@ -1276,6 +1292,7 @@ Weaponsmith 30+10 28+10 28+10 1 20 10 60+21 45+15 Mirror-Master 30+10 33+11 40+12 3 14 16 34+6 30+10 Ninja 45+15 24+10 36+10 8 48 32 70+25 66+18 +Gold-Mage 20+7 40+15 -inf 2 12 2 34+6 20+7 For character classes, there are two figures: the first figure is the base level of the ability, while the second figure is the bonus that diff -u -rN hengband/src/artifact.c hengband-g/src/artifact.c --- hengband/src/artifact.c Thu Mar 11 20:57:56 2004 +++ hengband-g/src/artifact.c Wed Jun 16 00:52:50 2004 @@ -1669,6 +1669,7 @@ case CLASS_SORCERER: case CLASS_MAGIC_EATER: case CLASS_BLUE_MAGE: + case CLASS_GOLD_MAGE: artifact_bias = BIAS_MAGE; break; case CLASS_PRIEST: diff -u -rN hengband/src/avatar.c hengband-g/src/avatar.c --- hengband/src/avatar.c Sun Jan 4 14:46:48 2004 +++ hengband-g/src/avatar.c Mon Jun 14 18:37:44 2004 @@ -212,6 +212,7 @@ p_ptr->vir_types[i++] = V_HONOUR; break; case CLASS_MAGE: + case CLASS_GOLD_MAGE: p_ptr->vir_types[i++] = V_KNOWLEDGE; p_ptr->vir_types[i++] = V_ENCHANT; break; diff -u -rN hengband/src/birth.c hengband-g/src/birth.c --- hengband/src/birth.c Thu Mar 11 20:57:56 2004 +++ hengband-g/src/birth.c Thu Jun 17 23:23:32 2004 @@ -1821,7 +1821,9 @@ "鏡使いは、魔力の込められた鏡を作り出して、それを触媒として攻撃を行なうことができる鏡魔法を使います。鏡使いは鏡の上で実力を発揮し、鏡の上では素早いテレポートが可能となります。魔法の鏡は、レベルによって一度に制御できる数が制限されます。鏡魔法に必要な能力は知能です。", -"忍者は暗闇に潜む恐るべき暗殺者であり、光源を持たずに行動し、相手の不意をつき一撃で息の根を止めます。また、相手を惑わすための忍術も身につけます。罠やドアを見つける能力に優れ、罠の解除や鍵開けに熟達しています。軽装を好み、重い鎧や武器を装備すると著しく動きが制限され、また、盾を装備しようとはしません。軽装ならば、レベルが上がるにつれより速くより静かに行動できます。さらに忍者は恐怖せず、成長すれば毒がほとんど効かなくなり、透明なものを見ることができるようになります。忍術に必要な能力は器用さです。" +"忍者は暗闇に潜む恐るべき暗殺者であり、光源を持たずに行動し、相手の不意をつき一撃で息の根を止めます。また、相手を惑わすための忍術も身につけます。罠やドアを見つける能力に優れ、罠の解除や鍵開けに熟達しています。軽装を好み、重い鎧や武器を装備すると著しく動きが制限され、また、盾を装備しようとはしません。軽装ならば、レベルが上がるにつれより速くより静かに行動できます。さらに忍者は恐怖せず、成長すれば毒がほとんど効かなくなり、透明なものを見ることができるようになります。忍術に必要な能力は器用さです。", + +"金魔道師はお金こそ全てだと信じる魔法使いです。魔力を使って硬貨を投げることによって敵を攻撃し、より金持ちになるべくその死体を宝に変換します。他の魔法使いと同じくらい魔法が得意ですが、お金のことばかり考えているので魔法防御はみじめなほど悪いです。魔法に必要な能力は知能です。" #else @@ -1877,7 +1879,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.", + +"Gold-Mages are mages who believe money is everything. They attack their enemy by throwing coins magically at it, then convert its corpse into treasure to be richer. They are as good at magic as other mages, but their saving throw is miserably poor because their mind is filled with money. Intelligence determines their spell casting ability." #endif }; @@ -3721,6 +3725,12 @@ { TV_SOFT_ARMOR, SV_SOFT_LEATHER_ARMOR }, { TV_SWORD, SV_DAGGER } }, + { + /* Gold Mage */ + { TV_SORCERY_BOOK, 0 }, /* Hack: for realm1 book */ + { TV_SCROLL, SV_SCROLL_DETECT_GOLD }, + { TV_DIGGING, SV_SHOVEL } + } }; diff -u -rN hengband/src/defines.h hengband-g/src/defines.h --- hengband/src/defines.h Wed Mar 10 21:06:24 2004 +++ hengband-g/src/defines.h Mon Jun 14 17:20:59 2004 @@ -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 @@ -900,6 +900,7 @@ #define CLASS_SMITH 24 #define CLASS_MIRROR_MASTER 25 #define CLASS_NINJA 26 +#define CLASS_GOLD_MAGE 27 #define SEIKAKU_FUTUU 0 #define SEIKAKU_CHIKARA 1 diff -u -rN hengband/src/dungeon.c hengband-g/src/dungeon.c --- hengband/src/dungeon.c Sun Mar 14 04:12:57 2004 +++ hengband-g/src/dungeon.c Mon Jun 14 21:12:11 2004 @@ -269,6 +269,7 @@ case CLASS_HIGH_MAGE: case CLASS_SORCERER: case CLASS_MAGIC_EATER: + case CLASS_GOLD_MAGE: { /* Very bad (light) sensing */ if (0 != randint0(240000L / (plev + 5))) return; @@ -525,6 +526,7 @@ case CLASS_MAGIC_EATER: case CLASS_MIRROR_MASTER: case CLASS_BLUE_MAGE: + case CLASS_GOLD_MAGE: { /* Good sensing */ if (0 != randint0(9000L / (plev * plev + 40))) return; diff -u -rN hengband/src/melee1.c hengband-g/src/melee1.c --- hengband/src/melee1.c Mon Jan 19 13:27:35 2004 +++ hengband-g/src/melee1.c Mon Jun 14 21:03:30 2004 @@ -868,8 +868,8 @@ /* Saving throw (unless paralyzed) based on dex and level */ if (!p_ptr->paralyzed && - (randint0(100) < (adj_dex_safe[p_ptr->stat_ind[A_DEX]] + - p_ptr->lev))) + ((p_ptr->pclass == CLASS_GOLD_MAGE) || (randint0(100) < (adj_dex_safe[p_ptr->stat_ind[A_DEX]] + + p_ptr->lev)))) { /* Saving throw message */ #ifdef JP @@ -949,8 +949,8 @@ /* Saving throw (unless paralyzed) based on dex and level */ if (!p_ptr->paralyzed && - (randint0(100) < (adj_dex_safe[p_ptr->stat_ind[A_DEX]] + - p_ptr->lev))) + ((p_ptr->pclass == CLASS_GOLD_MAGE) || (randint0(100) < (adj_dex_safe[p_ptr->stat_ind[A_DEX]] + + p_ptr->lev)))) { /* Saving throw message */ #ifdef JP diff -u -rN hengband/src/racial.c hengband-g/src/racial.c --- hengband/src/racial.c Wed Feb 11 02:01:59 2004 +++ hengband-g/src/racial.c Wed Jun 16 00:27:22 2004 @@ -12,6 +12,163 @@ #include "angband.h" +static int throw_coins_dam(void) +{ + int i = 0; + + if (p_ptr->au <= 0) + return 0; + + for (i = 1; i <= p_ptr->lev * 5; i++) + { + if (i * i * i > p_ptr->au) + break; + } + + i--; + if (i <= 0) + i = 1; + + return i; +} + +static bool do_cmd_throw_coins(void) +{ + int dir; + int dam; + int au_needed; + + if (p_ptr->confused) + { +#ifdef JP + msg_print("混乱してる！"); +#else + msg_print("You are too confused!"); +#endif + return FALSE; + } + + if (p_ptr->blind) + { +#ifdef JP + msg_print("目が見えない！"); +#else + msg_print("You are blind!"); +#endif + return FALSE; + } + + if (p_ptr->au <= 0) + { +#ifdef JP + msg_print("一文無しだ！"); +#else + msg_print("You have no money!"); +#endif + return FALSE; + } + + if (!get_aim_dir(&dir)) + return FALSE; + + dam = throw_coins_dam(); + au_needed = dam * dam / 100; + if (au_needed <= 0) + au_needed = 1; + + fire_rocket(GF_ROCKET, dir, dam, 0 + p_ptr->lev / 20); + + p_ptr->au -= au_needed; + if (p_ptr->au <= 0) + p_ptr->au = 0; + + /* Redraw gold */ + p_ptr->redraw |= (PR_GOLD); + + energy_use = 100 * 100 / (100 + p_ptr->lev * 4); + if (energy_use <= 0) + energy_use = 1; + + return TRUE; +} + +/* + * Hook to determine if an object can be sacrificed for 'greed' + */ +static bool item_tester_hook_greed(object_type *o_ptr) +{ + monster_race *r_ptr = NULL; + + if (o_ptr->tval != TV_CORPSE) + return (FALSE); + + r_ptr = &r_info[o_ptr->pval]; + if (r_ptr->flags1 & (RF1_UNIQUE)) + return (TRUE); + + /* Assume not */ + return (FALSE); +} + +static bool do_cmd_greed(void) +{ + if (p_ptr->confused) + { +#ifdef JP + msg_print("混乱してる！"); +#else + msg_print("You are too confused!"); +#endif + return FALSE; + } + + if (p_ptr->blind) + { +#ifdef JP + msg_print("目が見えない！"); +#else + msg_print("You are blind!"); +#endif + return FALSE; + } + + /* Acquirement at the cost of a unique corpse */ + { + int item; + + cptr q, s; + + item_tester_hook = item_tester_hook_greed; + + /* Get an item */ +#ifdef JP + q = "どの死体を生贄にしますか？ "; + s = "この能力を使うにはユニークモンスターの死体が必要だ。"; +#else + q = "Sacrifice which corpse? "; + s = "You need the corpse of a unique monster to use this ability."; +#endif + if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return FALSE; + + acquirement(py, px, 1, TRUE, FALSE); + + if (item >= 0) + { + inven_item_increase(item, -1); + inven_item_describe(item); + inven_item_optimize(item); + } + else + { + floor_item_increase(0 - item, -1); + floor_item_describe(0 - item); + floor_item_optimize(0 - item); + } + } + energy_use = 100; + return TRUE; +} + /* * Hook to determine if an object is contertible in an arrow/bolt */ @@ -1343,6 +1500,17 @@ energy_use = 0; break; } + case CLASS_GOLD_MAGE: + { + if (command == -3) + { + if (!do_cmd_throw_coins()) return FALSE; + } + else if (command == -4) + { + if (!do_cmd_greed()) return FALSE; + } + } } } else if (p_ptr->mimic_form) @@ -1699,6 +1867,7 @@ case CLASS_RED_MAGE: case CLASS_BLUE_MAGE: case CLASS_MIRROR_MASTER: + case CLASS_GOLD_MAGE: if (one_in_(3)) { Type = GF_MANA; @@ -2588,6 +2757,34 @@ power_desc[num].stat = A_DEX; power_desc[num].fail = 0; power_desc[num++].number = -3; + break; + } + case CLASS_GOLD_MAGE: + { + { + int dam = throw_coins_dam(); +#ifdef JP +sprintf(power_desc[num].name, "銭投げ (%d, $%d)", dam, ((dam * dam / 100 > 0) ? (dam * dam / 100) : 1)); +#else + sprintf(power_desc[num].name, "Throw Coins (%d, $%d)", (dam, (dam * dam / 100 > 0) ? (dam * dam / 100) : 1)); +#endif + } + power_desc[num].level = 1; + power_desc[num].cost = 1; + power_desc[num].stat = A_INT; + power_desc[num].fail = 0; + power_desc[num++].number = -3; +#ifdef JP +strcpy(power_desc[num].name, "強欲"); +#else + strcpy(power_desc[num].name, "Greed"); +#endif + + power_desc[num].level = 15; + power_desc[num].cost = 36; + power_desc[num].stat = A_INT; + power_desc[num].fail = 0; + power_desc[num++].number = -4; break; } default: diff -u -rN hengband/src/spells2.c hengband-g/src/spells2.c --- hengband/src/spells2.c Wed Mar 10 21:06:24 2004 +++ hengband-g/src/spells2.c Wed Jun 16 00:32:32 2004 @@ -845,6 +845,21 @@ #endif } break; + case CLASS_GOLD_MAGE: +#ifdef JP +info[i++] = "あなたは硬貨を投げて敵を攻撃することができる。 (1 MP)"; +#else + info[i++] = "You can attack your enemy by throwing coins at it. (cost 1)"; +#endif + if (plev > 14) + { +#ifdef JP +info[i++] = "あなたは特殊な死体から高級なアイテムを作ることができる。 (36 MP)"; +#else + info[i++] = "You can make a great item from a special corpse. (cost 36)"; +#endif + } + break; } if (p_ptr->muta1) diff -u -rN hengband/src/tables.c hengband-g/src/tables.c --- hengband/src/tables.c Sat Jan 3 00:18:33 2004 +++ hengband-g/src/tables.c Thu Jun 17 23:23:58 2004 @@ -2839,7 +2839,7 @@ 72, 6, 180, 25, 66, 4, 150, 20, 0, - 0x7FFFFFF, + 0xFFFFFFF, }, { #ifdef JP @@ -2854,7 +2854,7 @@ 66, 6, 130, 15, 62, 6, 100, 10, 2, - 0x677E7FF, + 0xE77E7FF, }, { #ifdef JP @@ -2869,7 +2869,7 @@ 60, 4, 100, 6, 54, 4, 80, 6, 3, - 0x677E75B, + 0xE77E75B, }, { @@ -2885,7 +2885,7 @@ 36, 3, 60, 3, 33, 3, 50, 3, 4, - 0x76FFC0B, + 0xF6FFC0B, }, { #ifdef JP @@ -2900,7 +2900,7 @@ 42, 3, 90, 6, 39, 3, 75, 3, 4, - 0x767D60F, + 0xF67D60F, }, { #ifdef JP @@ -2960,7 +2960,7 @@ 82, 5, 190, 20, 78, 6, 180, 15, 0, - 0x7FFF7FF, + 0xFFFF7FF, }, { #ifdef JP @@ -2975,7 +2975,7 @@ 90, 10, 190, 20, 82, 10, 180, 15, 4, - 0x777E75B, + 0xF77E75B, }, { #ifdef JP @@ -3035,7 +3035,7 @@ 111, 11, 255, 86, 99, 11, 250, 86, 0, - 0x23D4727, + 0xA3D4727, }, { #ifdef JP @@ -3065,7 +3065,7 @@ 50, 3, 90, 6, 50, 3, 75, 3, 2, - 0x667360F, + 0xE67360F, }, { #ifdef JP @@ -3125,7 +3125,7 @@ 60, 4, 100, 6, 54, 4, 80, 6, 5, - 0x677C7DF, + 0xE77C7DF, }, { #ifdef JP @@ -3140,7 +3140,7 @@ 76, 1, 160, 5, 72, 1, 130, 5, 2, - 0x7FFE757, + 0xFFFE757, }, { #ifdef JP @@ -3155,7 +3155,7 @@ 68, 6, 142, 15, 63, 6, 112, 10, 4, - 0x2334746, + 0xA334746, }, { #ifdef JP @@ -3170,7 +3170,7 @@ 68, 1, 150, 5, 64, 1, 120, 5, 3, - 0x6B537CB, + 0xEB537CB, }, { #ifdef JP @@ -3200,7 +3200,7 @@ 72, 6, 50, 5, 66, 4, 50, 5, 2, - 0x234070F, + 0xA34070F, }, { #ifdef JP @@ -3230,7 +3230,7 @@ 72, 6, 180, 25, 66, 4, 150, 20, 5, - 0x67DC7FF, + 0xE7DC7FF, }, { #ifdef JP @@ -3245,7 +3245,7 @@ 72, 6, 100, 25, 66, 4, 100, 20, 5, - 0x631474A, + 0xE31474A, }, { #ifdef JP @@ -3260,7 +3260,7 @@ 32, 2, 75, 2, 29, 2, 65, 2, 4, - 0x623F65E, + 0xE23F65E, }, { #ifdef JP @@ -3304,7 +3304,7 @@ 82, 5, 190, 20, 78, 6, 180, 15, 3, - 0x779F777, + 0xF79F777, }, { #ifdef JP @@ -3321,7 +3321,7 @@ 100,10, 255, 65, 80, 10, 240, 64, 5, - 0x7EDC4DB, + 0xFEDC4DB, }, { #ifdef JP @@ -3336,7 +3336,7 @@ 82, 5, 190, 20, 78, 6, 180, 15, 0, - 0x7FFF7FF, + 0xFFFF7FF, }, { #ifdef JP @@ -3350,7 +3350,7 @@ 80, 8, 90, 20, 73, 8, 80, 15, 4, - 0x633C7DF, + 0xE33C7DF, }, { #ifdef JP @@ -3712,6 +3712,17 @@ 15, 10, 10, 0, 0, 0, 25,18, 2, 20, 40 }, + { +#ifdef JP + "金魔道師", +#endif + "Gold-Mage", + + { -4, 2, -2, -1, -2, 4}, + 20, 40, -200, 2, 12, 2, 34,20, + 7, 15, 0, 0, 0, 0, 6, 7, + 0, 30, 40 + } }; player_seikaku seikaku_info[MAX_SEIKAKU] = @@ -4039,6 +4050,7 @@ (CH_NONE), /* Kaji */ (CH_NONE), /* Mirror-master */ (CH_NONE), /* Ninja */ + (CH_SORCERY) /* Gold Mage */ }; @@ -4081,6 +4093,7 @@ (CH_NONE), /* Kaji */ (CH_NONE), /* Mirror-master */ (CH_NONE), /* Ninja */ + (CH_NONE), /* Gold-Mage */ }; @@ -4605,6 +4618,20 @@ "暗殺者", "死の長き腕", }, + /* Gold Mage */ + { + /*"見習い",*/ + "練習生", /*丁稚、練習生 */ + "奇術師", /*詐欺師、ペテン師 */ + "幻術師", + "呪術師", + "召霊師", + "召魔師", + "魔術師", + "魔道師", + "イプシシマス", + "大魔道師", + } }; #else @@ -4987,6 +5014,19 @@ "Assassinator", "Death Lord", }, + /* Mage */ + { + "Apprentice", + "Trickster", + "Illusionist", + "Spellbinder", + "Evoker", + "Conjurer", + "Warlock", + "Sorcerer", + "Ipsissimus", + "Archimage", + } }; #endif diff -u -rN hengband/src/xtra1.c hengband-g/src/xtra1.c --- hengband/src/xtra1.c Mon Jan 19 20:10:55 2004 +++ hengband-g/src/xtra1.c Fri Jun 18 00:25:12 2004 @@ -2473,6 +2473,7 @@ case CLASS_MONK: case CLASS_FORCETRAINER: case CLASS_SORCERER: + case CLASS_GOLD_MAGE: { if (inventory[INVEN_RARM].tval <= TV_SWORD) cur_wgt += inventory[INVEN_RARM].weight; if (inventory[INVEN_LARM].tval <= TV_SWORD) cur_wgt += inventory[INVEN_LARM].weight; @@ -2542,6 +2543,7 @@ case CLASS_MAGE: case CLASS_HIGH_MAGE: case CLASS_BLUE_MAGE: + case CLASS_GOLD_MAGE: { msp -= msp * (cur_wgt - max_wgt) / 600; break; @@ -4798,6 +4800,7 @@ case CLASS_MAGE: case CLASS_HIGH_MAGE: case CLASS_BLUE_MAGE: + case CLASS_GOLD_MAGE: num = 3; wgt = 100; mul = 2; break; /* Priest, Mindcrafter */