OSDN Git Service

(root) / jnethack / htdocs.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
update fighter patch for 3.4.3
[jnethack/htdocs.git] / patch / fighter.patch
1 diff -urN JNH34302SJIS/dat/Fighter.des Fig34302/dat/Fighter.des
2 --- JNH34302SJIS/dat/Fighter.des        Thu Jan  1 00:00:00 1970
3 +++ Fig34302/dat/Fighter.des    Thu Mar 18 21:24:12 2004
4 @@ -0,0 +1,331 @@
5 +#      SCCS Id: @(#)Arch.des   3.2     91/12/13
6 +#      Copyright (c) 1989 by Jean-Christophe Collet
7 +#      Copyright (c) 1991 by M. Stephenson
8 +# NetHack may be freely redistributed.  See license for details.
9 +#
10 +#      Japanese version Copyright
11 +#      (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000
12 +#      For 3.4, Copyright (c) Kentaro Shirakata, 2002-2003
13 +# JNetHack may be freely redistributed.  See license for details. 
14 +#
15 +#
16 +#      The "start" level for the quest.
17 +#
18 +MAZE: "Fig-strt",' '
19 +FLAGS: noteleport,hardfloor
20 +GEOMETRY:center,center
21 +#         1    1    2    2    3    3    4    4    5    5    6    6    7    7
22 +#1   5    0    5    0    5    0    5    0    5    0    5    0    5    0    5
23 +MAP
24 +.........}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}...........
25 +.......}}}---------....................................---------}}}.........
26 +......}}..........---................................---.......---}.........
27 +......}--...........---------..---...-------------.---......................
28 +......}|.............S..............................S.............|}........
29 +......}--...........-----------------+----------------...........--}........
30 +......}}---.......---...........|.........|..........---.......-.-}}........
31 +.......}}}----.----.....---------....\....--------.....----S----}.}.........
32 +.........}}}|...|.......|........................|.......|...|}}}...........
33 +...........}|...|.......|................................|...|}.............
34 +...........}|...|.......|........................|.......|...|}.............
35 +.........}}}|...|.......|........................|.......|...|}}}...........
36 +.......}}}----S----.....|........................|.....----S----}}}.........
37 +......}}---.......---...|........................|...---.......---}}........
38 +......}--...........--..-----------------..--.----..--...........--}........
39 +......}|.............|}}}}}}}}}}}}}}}}}}}}.}}}..}}}}}..............|}.......
40 +......}--...........--}............................}--...........--}........
41 +......}}---.......---}}............................}}---.......---}}........
42 +.......}}}----..---}}}..............................}}}--.--..--}}}.........
43 +.........}}}}}}}}}}}..................................}}}}}}}}}}}...........
44 +ENDMAP
45 +# Dungeon Description
46 +REGION:(00,00,75,19),lit,"ordinary"
47 +# Stairs
48 +STAIR:(62,17),down
49 +# Portal arrival point
50 +BRANCH:(42,17,42,17),(0,0,0,0)
51 +# Doors
52 +DOOR:locked,(14,12)
53 +DOOR:locked,(59,12)
54 +DOOR:locked,(59,7)
55 +DOOR:locked,(52,4)
56 +DOOR:locked,(21,4)
57 +DOOR:locked,(37,5)
58 +# Princess Serenity
59 +MONSTER:'@',"Princess of Moon",(37,7)
60 +# Chest
61 +OBJECT:'(',"chest",(11,14)
62 +OBJECT:'(',"chest",(11,16)
63 +OBJECT:'(',"chest",(16,14)
64 +OBJECT:'(',"chest",(16,16)
65 +# Eight Sailor Fighters
66 +MONSTER:'@',"planetary fighter",(29,8)
67 +MONSTER:'@',"planetary fighter",(29,13)
68 +MONSTER:'@',"planetary fighter",(39,8)
69 +MONSTER:'@',"planetary fighter",(39,13)
70 +MONSTER:'@',"planetary fighter",(14,15)
71 +MONSTER:'@',"planetary fighter",(14,4)
72 +MONSTER:'@',"planetary fighter",(59,4)
73 +MONSTER:'@',"planetary fighter",(59,15)
74 +#
75 +DRAWBRIDGE:(37,15),north,closed
76 +# Non diggable walls
77 +NON_DIGGABLE:(00,00,75,19)
78 +# Random traps
79 +TRAP:"pit",random
80 +TRAP:"pit",random
81 +TRAP:"pit",random
82 +TRAP:"pit",random
83 +TRAP:"pit",random
84 +# Monsters on siege duty.
85 +MONSTER: 'Z',random,(70,09)
86 +MONSTER: 'Z',random,(70,10)
87 +MONSTER: 'Z',random,(70,11)
88 +MONSTER: 'Z',random,(70,12)
89 +MONSTER: 'Z',random,(70,13)
90 +MONSTER: 'Z',random,(70,14)
91 +MONSTER: 'S',random,(25,17)
92 +MONSTER: 'S',random,(25,18)
93 +MONSTER: 'S',random,(25,19)
94 +MONSTER: 'S',random,(26,17)
95 +MONSTER: 'S',random,(26,18)
96 +MONSTER: 'S',random,(26,19)
97 +
98 +#
99 +#      The "locate" level for the quest.
100 +#
101 +
102 +MAZE: "Fig-loca",' '
103 +FLAGS: hardfloor
104 +GEOMETRY:center,center
105 +#         1    1    2    2    3    3    4    4    5    5    6    6    7    7
106 +#1   5    0    5    0    5    0    5    0    5    0    5    0    5    0    5
107 +MAP
108 +------------------------------------------------------------------------....
109 +|----------------------................................................|....
110 +||....................|................................................|....
111 +||....................|-----...........................................|....
112 +||....................+....|...........................................|....
113 +||....................|....|................................................
114 +||....................|-----................................................
115 +||....................|.....................................................
116 +|-----------------++---................................................|....
117 +|................|..|..................................................|....
118 +|-----------------++-------------------------------------....----------|....
119 +||.....................................................................|....
120 +||----------++------------++------------++------------++------------++-|....
121 +||.............|.............|.............|.............|.............|....
122 +||.............|.............|.............|.............|.............|....
123 +||.............|.............|.............|.............|.............|....
124 +||.............|.............|.............|.............|.............|....
125 +------------------------------------------------------------------------....
126 +ENDMAP
127 +# Dungeon Description
128 +REGION:(00,00,75,17),lit,"ordinary"
129 +REGION:(01,11,71,17),unlit,"ordinary"
130 +REGION:(01,01,22,08),unlit,"temple"
131 +# Doors
132 +DOOR:closed,(22,4)
133 +DOOR:closed,(18,8)
134 +DOOR:closed,(19,8)
135 +DOOR:closed,(18,10)
136 +DOOR:closed,(19,10)
137 +#DOOR:closed,(68,10)
138 +#DOOR:closed,(69,10)
139 +DOOR:closed,(12,12)
140 +DOOR:closed,(13,12)
141 +DOOR:closed,(26,12)
142 +DOOR:closed,(27,12)
143 +DOOR:closed,(40,12)
144 +DOOR:closed,(41,12)
145 +DOOR:closed,(54,12)
146 +DOOR:closed,(55,12)
147 +DOOR:closed,(68,12)
148 +DOOR:closed,(69,12)
149 +# Stairs
150 +STAIR:(25,5),down
151 +STAIR:(71,6),up
152 +# Non diggable walls
153 +NON_DIGGABLE:(00,00,75,17)
154 +# Objects
155 +OBJECT:random,random,random
156 +OBJECT:random,random,random
157 +OBJECT:random,random,random
158 +OBJECT:random,random,random
159 +# Random traps
160 +TRAP:random,random
161 +TRAP:random,random
162 +TRAP:random,random
163 +TRAP:random,random
164 +TRAP:random,random
165 +TRAP:random,random
166 +TRAP:random,random
167 +TRAP:random,random
168 +# Random monsters.
169 +MONSTER:'S',random,random
170 +MONSTER:'S',random,random
171 +MONSTER:'S',random,random
172 +MONSTER:'S',random,random
173 +MONSTER:'S',random,random
174 +MONSTER:'S',random,random
175 +MONSTER:'S',random,random
176 +MONSTER:'S',random,random
177 +MONSTER:'Z',random,random
178 +MONSTER:'Z',random,random
179 +MONSTER:'Z',random,random
180 +MONSTER:'Z',random,random
181 +MONSTER:'Z',random,random
182 +MONSTER:'Z',random,random
183 +MONSTER:'Z',random,random
184 +MONSTER:'Z',random,random
185 +#
186 +ALTAR:(10,04),chaos,altar
187 +#
188 +ENGRAVING:(21,04),engrave,"ÂΰéÍѶñ¼¼"
189 +ENGRAVING:(13,11),engrave,"Íý²Ê¼¼"
190 +ENGRAVING:(55,11),engrave,"Ï­²¼¤ÏÀŤ«¤Ë"
191 +#
192 +OBJECT:'!',random,(2,13)
193 +OBJECT:'!',random,(3,13)
194 +OBJECT:'!',random,(4,13)
195 +OBJECT:'!',random,(2,14)
196 +OBJECT:'!',random,(3,14)
197 +OBJECT:'!',random,(4,14)
198 +OBJECT:'!',random,(2,15)
199 +OBJECT:'!',random,(3,15)
200 +OBJECT:'!',random,(4,15)
201 +#
202 +#      The "goal" level for the quest.
203 +#
204 +#      Here you meet Minion of Huhetol your nemesis monster.  You have to
205 +#      defeat Minion of Huhetol in combat to gain the artifact you have
206 +#      been assigned to retrieve.
207 +#
208 +
209 +MAZE: "Fig-goal", ' '
210 +FLAGS: hardfloor
211 +GEOMETRY:center,center
212 +#         1    1    2    2    3
213 +#1   5    0    5    0    5    0
214 +MAP
215 +-------------------------------
216 +|.............................|
217 +|.............................|
218 +|.........LLLLLLLLLLL.........|
219 +|........L...........L........|
220 +|.......L.............L.......|
221 +|.......L.............L.......|
222 +|.......L.............L.......|
223 +|.......L.............L.......|
224 +|.......L.............L.......|
225 +|.......L.............L.......|
226 +|........L...........L........|
227 +|.........LLLL...LLLL.........|
228 +|.............................|
229 +|.............................|
230 +-------------------------------
231 +ENDMAP
232 +# Dungeon Description
233 +REGION:(00,00,30,15),lit,"ordinary"
234 +# Stairs
235 +STAIR:(29,14),up
236 +# Non diggable walls
237 +NON_DIGGABLE:(00,00,30,15)
238 +# Objects
239 +OBJECT:'*',"dilithium crystal",(15,7),blessed,0,"The Silver Crystal"
240 +OBJECT:random,random,random
241 +OBJECT:random,random,random
242 +OBJECT:random,random,random
243 +OBJECT:random,random,random
244 +OBJECT:random,random,random
245 +OBJECT:random,random,random
246 +OBJECT:random,random,random
247 +OBJECT:random,random,random
248 +OBJECT:random,random,random
249 +OBJECT:random,random,random
250 +OBJECT:random,random,random
251 +OBJECT:random,random,random
252 +OBJECT:random,random,random
253 +OBJECT:random,random,random
254 +# Random traps
255 +TRAP:random,random
256 +TRAP:random,random
257 +TRAP:random,random
258 +TRAP:random,random
259 +TRAP:random,random
260 +TRAP:random,random
261 +# Random monsters.
262 +MONSTER:'@',"Jedeite",(15,7)
263 +MONSTER:'S',random,random
264 +MONSTER:'S',random,random
265 +MONSTER:'S',random,random
266 +MONSTER:'S',random,random
267 +MONSTER:'S',random,random
268 +MONSTER:'S',random,random
269 +MONSTER:'S',random,random
270 +MONSTER:'S',random,random
271 +MONSTER:'S',random,random
272 +MONSTER:'Z',random,random
273 +MONSTER:'Z',random,random
274 +MONSTER:'Z',random,random
275 +MONSTER:'Z',random,random
276 +MONSTER:'Z',random,random
277 +MONSTER:'Z',random,random
278 +MONSTER:'Z',random,random
279 +MONSTER:'Z',random,random
280 +MONSTER:'Z',random,random
281 +
282 +#
283 +#      The "fill" levels for the quest.
284 +#
285 +
286 +MAZE: "Fig-fila" , ' '
287 +INIT_MAP: '.' , ' ' , true , true , lit, false
288 +NOMAP
289 +STAIR:random, up
290 +STAIR:random, down
291 +#
292 +MONSTER: 'Z', random, random
293 +MONSTER: 'Z', random, random
294 +MONSTER: 'Z', random, random
295 +MONSTER: 'Z', random, random
296 +MONSTER: 'Z', random, random
297 +MONSTER: 'Z', random, random
298 +MONSTER: 'Z', random, random
299 +MONSTER: 'S', random, random
300 +MONSTER: 'S', random, random
301 +MONSTER: 'S', random, random
302 +
303 +TRAP: random, random
304 +TRAP: random, random
305 +TRAP: random, random
306 +TRAP: random, random
307 +TRAP: random, random
308 +TRAP: random, random
309 +TRAP: random, random
310 +
311 +MAZE: "Fig-filb" , 'L'
312 +INIT_MAP: '.' , 'L' , true , true , lit, false
313 +NOMAP
314 +STAIR:random, up
315 +STAIR:random, down
316 +#
317 +MONSTER: 'Z', random, random
318 +MONSTER: 'Z', random, random
319 +MONSTER: 'Z', random, random
320 +MONSTER: 'S', random, random
321 +MONSTER: 'S', random, random
322 +MONSTER: 'S', random, random
323 +MONSTER: 'S', random, random
324 +MONSTER: 'S', random, random
325 +MONSTER: 'S', random, random
326 +MONSTER: 'S', random, random
327 +MONSTER: 'S', random, random
328 +
329 +TRAP: random, random
330 +TRAP: random, random
331 +TRAP: random, random
332 +TRAP: random, random
333 +TRAP: random, random
334 +TRAP: random, random
335 +TRAP: random, random
336 diff -urN JNH34302SJIS/dat/jquest.txt Fig34302/dat/jquest.txt
337 --- JNH34302SJIS/dat/jquest.txt Sun Feb 29 13:02:52 2004
338 +++ Fig34302/dat/jquest.txt     Thu Mar 18 21:28:22 2004
339 @@ -1242,6 +1242,227 @@
340  ¡ÖËâ½ü¤±¤ò¸¥¾å¤»¤è¡¥%d¤¬·Þ¤¨¤Æ¤¯¤ì¤ë¤À¤í¤¦¡ª¡×
341  %E
342  #
343 +#      Fighter
344 +#
345 +%Cc Fig 00001
346 +¤¢¤Ê¤¿¤ÏÆÍÁ³¸«³Ð¤¨¤Î¤¢¤ë¾ì½ê¤ËΩ¤Ã¤Æ¤¤¤ë¤Î¤Ëµ¤¤¬¤Ä¤¤¤¿¡¥´Ö°ã¤¤¤Ê¤¤¤³¤³
347 +¤Ï%H¤Ç¤¢¤ë¡¥¤·¤«¤·²¿¤«¤¬°ã¤¦¡¥¤Þ¤ë¤Ç²¿¤«·ã¤·¤¤ÀïÆ®¤¬
348 +¤¢¤Ã¤¿¤«¤Î¤è¤¦¤Ë»¦È²¤È¤·¤Æ¤¤¤ë¡¥¤Þ¤ë¤ÇÇѵõ¤À¡¥
349 +
350 +%l¤Î¸µ¤ØµÞ¤¬¤Í¤Ð¤ÈËÜǽŪ¤Ë¤¢¤Ê¤¿¤Ï´¶¤¸¤¿¡¥
351 +%E
352 +%Cp Fig 00002
353 +¤â¤¦°ìÅÙ¡¤¤¢¤Ê¤¿¤Ï%H¤ËÌá¤Ã¤¿¡¥
354 +%E
355 +%Cp Fig 00003
356 +¤¢¤Ê¤¿¤Ï%H¤ËÌá¤Ã¤¿¡¥
357 +¤¢¤Ê¤¿¤Ï¡¤¤â¤¦»þ´Ö¤¬¤Ê¤¤¤ÈËÜǽ¤Ç»¡¤·¤¿
358 +%E
359 +%Cp Fig 00005
360 +¡Öµ¤¤ò¤Ä¤±¤Æ¡ª%n¤ÎÎϤϰÊÁ°¤È¤ÏÈæ¤Ù¤â¤Î¤Ë¤Ê¤é¤Ê¤¤¤ï¡¥¡×
361 +%E
362 +%Cp Fig 00006
363 +¡Ö%n¤¬%o¤Î¿¿¤ÎÎϤòÆÀ¤ì¤ÐÀ¤³¦¤Ï°Ç¤ËÊĤ¶¤µ¤ì¤ë¡¥
364 +  µÞ¤¤¤Ç¡ª¡×
365 +%E
366 +%Cp Fig 00007
367 +¡Ö»ä¤¿¤Á¤Ï%H¤ò¼é¤ë¤À¤±¤ÇÀº°ìÇդʤΡ¥¤â¤¦¤¢¤Ê¤¿¤ËÍê¤ë¤·¤«
368 +  ¤Ê¤¤¤ï¡¥¡×
369 +%E
370 +%Cp Fig 00008
371 +¡Ö%o¤Ê¤·¤Ç¤Ï%l¤Ï¤½¤ÎÎϤÎȾʬ¤âȯ´ø¤Ç¤­¤Ê¤¤¡¥
372 +  °ìÂΤɤ¦¤¹¤ì¤Ð¡¥¡¥¡¥¡×
373 +%E
374 +%Cp Fig 00009
375 +¡Ö¤³¤Î¤è¤¦¤Ê»þ¤Ë¤¢¤Î¿Í¤µ¤¨¤¤¤Æ¤¯¤ì¤ì¤Ð¡¥¡¥¡¥¡×
376 +%E
377 +%Cp Fig 00010
378 +%E
379 +%Cp Fig 00011
380 +%E
381 +%Cp Fig 00012
382 +%E
383 +%Cp Fig 00013
384 +%E
385 +%Cp Fig 00014
386 +%E
387 +%Cc Fig 00015
388 +¡ÖÌá¤Ã¤Æ¤­¤Æ¤¯¤ì¤¿¤Î¤Í¡¤%p¡¥¤¢¤Ê¤¿¤ÏÀµµÁ´¶¤¬¶¯¤¤¤«¤é
389 +  ¤­¤Ã¤Èµ¢¤Ã¤Æ¤¯¤ë¤È»×¤Ã¤Æ¤¿¤ï¡¥
390 +¡Ö¤´Í÷¤ÎÄ̤ê%H¤Ï»¶¡¹¤¿¤ë¾õÂ֤ʤΡ¥¤ª´ê¤¤¤À¤«¤é»ä¤¿¤Á
391 +  ¤È¤¤¤Ã¤·¤ç¤ËÀï¤Ã¤Æ¤Á¤ç¤¦¤À¤¤¡©¡×
392 +%E
393 +%Cp Fig 00016
394 +¡Ö¤Þ¤¿Íè¤Æ¤¯¤ì¤¿¤Î¤Í¡¤%p¡¥
395 +  ¤¤¤Ã¤·¤ç¤ËÀï¤Ã¤Æ¤¯¤ì¤ë¤Î¡©¡×
396 +%E
397 +%Cp Fig 00017
398 +¡Ö¤â¤¦»þ´Ö¤¬¤Ê¤¤¤ï¡¥
399 +  ¤¤¤Ã¤·¤ç¤ËÀï¤Ã¤Æ¤¯¤ì¤ë¤Î¡©¡×
400 +%E
401 +%Cc Fig 00018
402 +¡Ö¤â¤¦¤ª¤·¤Þ¤¤¤À¤ï¡¤%p¡¥¤³¤ÎÀ¤¤Ï»þ´ü¡¤Á´¤Æ¤¬°Ç¤Ë¤Î¤Þ¤ì¤ë¤ï¡¥
403 +  ²¿¤â¤«¤â¤ª¤·¤Þ¤¤¡¥¡¥¡¥¡¥
404 +
405 +  ¤¢¤¿¤·¤â¥¨¥Ê¥¸¡¼¤òµÛ¤¤¼è¤é¤ì¡¤°Ç¤Î¿Ð¤È¾Ã¤¨¤Æ¤·¤Þ¤¦¤ï¡¥¤³¤ì¤â
406 +  ½ÉÌ¿¤Ê¤Î¤Í¡¥¡¥¡¥¡×
407 +%E
408 +%Cc Fig 00019
409 +¡Ö¤Ç¤â¤Í%p¡¥¤¢¤Ê¤¿¤Ï¤Þ¤À¤Á¤ç¤Ã¤È̤½Ï¤À¤ï¡¥
410 +  %r¤Ç¤Ï»à¤ËµÞ¤°¤è¤¦¤Ê¤â¤Î¤è¡¥µ¤»ý¤Á¤Ï¤ï¤«¤ë¤±¤É
411 +  %R¤¯¤é¤¤¤¸¤ã¤Ê¤¤¤È¡¥¡¥¡¥¡×
412 +%E
413 +%Cc Fig 00020
414 +¡Ö%p¡¥¤É¤¦¤·¤Æ¤Ê¤Î¡©
415 +
416 +¡Ö%a¤ÎÆ»¤«¤é¤Ï¤º¤ì¤¿¤³¤È¤ò¤·¤Æ¤¿¤Ã¤Æ¡¤¹¬¤»¤Ë¤Ï¤Ê¤ì¤Ê¤¤¤ï¡¥¤ª´ê¤¤¡ª
417 +  Ìܤò¤µ¤Þ¤·¤Æ¡ª¡×
418 +%E
419 +%Cc Fig 00021
420 +¡Öº£À¤³¦¤ÏÀäÌÇ¤Î´íµ¡¤ËÉΤ·¤Æ¤¤¤ë¤Î%p¡¥
421 +
422 +¡ÖÉü³è¤·¤¿%n¤¬%o¤òÅð¤ß%i¤Ë
423 +  Æ¨¤²¹þ¤ó¤À¤ï¡¥Èà¤Ï%o¤Î¥¨¥Ê¥¸¡¼¤òÍѤ¤¤Æ¡¤Á´À¤³¦¤ËÍÅËâ¤ò
424 +  Á÷¤ê¹þ¤â¤¦¤È¤·¤Æ¤¤¤ë¡¥
425 +
426 +¡Ö¤¢¤¿¤·¤Ïº£¼«Ê¬¤Ë»Ä¤µ¤ì¤¿ÎϤÈÁ´¤Æ¤ÎÃç´Ö¤¿¤Á¤ÎÎϤòÍѤ¤¤ÆÀ¤³¦¤¬°Ç¤ËÊĤ¶¤µ¤ì¤ë
427 +  ¤Î¤òËɤ¤¤Ç¤¤¤ë¤±¤É¡¤%o¤¬¤Ê¤¤¾õÂ֤Ǥɤ³¤Þ¤Ç´èÄ¥¤ì¤ë¤«¼«¿®¤¬
428 +  ¤Ê¤¤¤Î¡¥
429 +
430 +¡Ö%i¤Ø³¤¯°Ç¤Î²óÏ­¤ÎÉõ°õ¤òº£²ò¤­¤Þ¤¹¡¥
431 +  ¤ª´ê¤¤%i¤Ë¹Ô¤Ã¤Æ%n¤òÅݤ·¤Æ¡ªÀ¤³¦¤Ï¤¢¤Ê¤¿¤Ë¤«¤«¤Ã¤Æ
432 +  ¤¤¤ë¤Î¤è¡ª¤ª´ê¤¤¡ª¡×
433 +%E
434 +%Cp Fig 00025
435 +¡Ö%n¤Ï¶¯¤¤¤ï¡ªµ¤¤ò¤Ä¤±¤Æ¤Í¡ª¡×
436 +%E
437 +%Cp Fig 00026
438 +¡Ö%i¤Ë¹Ô¤¯¤Þ¤Ç¤¬ÂçÊѤ衪¡×
439 +%E
440 +%Cp Fig 00027
441 +¡Ö¤³¤³¤Ï»ä¤¿¤Á¤ËǤ¤»¤Æ¡ª¡×
442 +%E
443 +%Cp Fig 00028
444 +¡Ö¤­¤Ã¤È%d¤¬¼é¤Ã¤Æ¤¯¤ì¤ë¤ï¡ª¿®¤¸¤Æ¡ª¡×
445 +%E
446 +%Cp Fig 00029
447 +¡Ö%n¤Ï°ìÂβ¿¤ò¹Í¤¨¤Æ¤¤¤ë¤Î¤«¤·¤é¡©¡×
448 +%E
449 +%Cp Fig 00030
450 +¡Ö%o¤Ï¶¯ÎϤʥѥ¤ò»ý¤Ã¤Æ¤¤¤ë¤Î¡¥¤¢¤ó¤Ê¤Î¤¬
451 +  %n¤Î¼ê¤Ë¤ï¤¿¤Ã¤¿¤é¡¥¡¥¡¥¡×
452 +%E
453 +%Cp Fig 00031
454 +¡Ö%H¤ò¼é¤ë¤Î¤¬¤¢¤¿¤·Ã£¤ÎǤ̳¡¥¡×
455 +%E
456 +%Cp Fig 00032
457 +¡Ö¤½¤¦¤è¤Í¡©µã¤¤¤Æ¤¤¤ë¾ì¹ç¤¸¤ã¤Ê¤¤¤Î¤è¤Í¡ª¡×
458 +%E
459 +%Cp Fig 00033
460 +¡Ö¤¢¤¡¡¤¤¢¤Î¿Í¤µ¤¨¤¤¤Æ¤¯¤ì¤ì¤Ð¡¥¡¥¡¥¡×
461 +%E
462 +%Cp Fig 00034
463 +¡ÖÀ¸¤­¤Æ¤«¤¨¤Ã¤Æ¤­¤Æ¤Í¡¥%p¡¥¡×
464 +%E
465 +%Cp Fig 00035
466 +¤¢¤Ê¤¿¤Ï²óÏ­¤òÈ´¤±%i¤Þ¤Ç¤ä¤Ã¤Æ¤­¤¿¡¥ÌܤÎÁ°¤Ë¸«³Ð¤¨¤Î¤¢¤ë
467 +É÷·Ê¤¬¹­¤¬¤ë¡ª¤³¤³¤Ï¤¢¤Ê¤¿¤ÎÊì¹»¤À¡ª¤·¤«¤·¡¤¤É¤³¤Ë¤âÀ¸Å̤Τ¤¤ëµ¤ÇۤϤʤ¤¡ª
468 +
469 +ÉÔµ¤Ì£¤Ê¤¦¤á¤­À¼¤¬Âΰé´Û¤Î¤Û¤¦¤«¤éʹ¤³¤¨¤¿¡¥¤¢¤Ê¤¿¤Ï³Ð¸ç¤ò·è¤á¤Æ
470 +³Ø¹»¤ÎÀµÌç¤Ë¸þ¤Ã¤¿¡¥
471 +%E
472 +%Cp Fig 00036
473 +¤â¤¦°ìÅÙ¡¤¤¢¤Ê¤¿¤Ï%i¤Þ¤Ç¤ä¤Ã¤Æ¤­¤¿¡¥
474 +%E
475 +%Cp Fig 00040
476 +¤¢¤Ê¤¿¤Ï%o¤Î¸ºß¤ò´¶¤¸¤¿¡¥
477 +%E
478 +%Cp Fig 00041
479 +%o¤Î¸ºß¤¬¶õµ¤¤òÄ̤·¤Æ¤Ä¤¿¤ï¤Ã¤Æ¤­¤¿¡¥
480 +%E
481 +%Cc Fig 00050
482 +¡ÖÍ褿¤Ê¡ª%c¤è¡¤»ä¤Ï°ÊÁ°¤Î»ä¤È¤Ï°ã¤¦¤¾¡¥
483 +  %o¤òÆÀ¤Æ¥¨¥Ê¥¸¡¼¤¬¤ß¤Ê¤®¤Ã¤Æ¤¤¤ë¤«¤é¤Ê¡¥
484 +
485 +¡Ö¤µ¤¢¡¤Á´ÎϤÇÍ褤¡ª%c¤Ø¤Îº¨¤ß¤ò¤³¤Î¾ì¤Ç¤Ï¤é¤·¤Æ¤ä¤ë¡¥¡×
486 +%E
487 +%Cc Fig 00051
488 +¡ÖÀ­Ä¨¤ê¤â¤Ê¤¯¤Þ¤¿¤ä¤Ã¤Æ¤­¤¿¤«%c¤è¡¥
489 +
490 +¡Ö%o¤Ï¤â¤Ï¤ä²æ¤¬¼êÃæ¤Ë¤¢¤ë¡¥
491 +
492 +¡Ö¤³¤ó¤É¤³¤½¤ªÁ°¤Îº²¤ò¤¢¤ÎÀ¤¤ËÁ÷¤Ã¤Æ¤ä¤í¤¦¡¥¡×
493 +%E
494 +%Cp Fig 00052
495 +¡Ö¤·¤Ö¤È¤¤¤ä¤Ä¤á¡ªº£ÅÙ¤³¤½¤¢¤ÎÀ¤¤ËÁ÷¤Ã¤Æ¤ä¤ë¡ª¡×
496 +%E
497 +%Cp Fig 00053
498 +¡Ö¤¯¤½¡ªÈ´¤«¤Ã¤¿¡ª%o¤òÊÖ¤»¡ª¡×
499 +%E
500 +%Cp Fig 00060
501 +¡Ö¤µ¤¢¤³¤¤%c¡ª¡×
502 +%E
503 +%Cp Fig 00061
504 +¡Ö%o¤ÎÎϤȤ¯¤È¸«¤»¤Æ¤ä¤í¤¦¡ª¡×
505 +%E
506 +%Cp Fig 00062
507 +¡Ö%c¤ª¤½¤ë¤Ë¤¿¤ê¤º¡ª¡×
508 +%E
509 +%Cp Fig 00063
510 +¡Ö¤ä¤á¤Æ¤ª¤±¡ª¡×
511 +%E
512 +%Cp Fig 00064
513 +¡Ö¤ª¤Þ¤¨¤Î¥¨¥Ê¥¸¡¼¤âµÛ¤¤¼è¤Ã¤Æ¤ä¤ë¡ª¡×
514 +%E
515 +%Cp Fig 00065
516 +¡Ö¤ª¤Þ¤¨¤ÎÎϤϤ½¤ó¤Ê¤â¤Î¤«¡©¡×
517 +%E
518 +%Cp Fig 00066
519 +¡Ö¤Ï¤Ï¤Ï¤Ï¡ª¤½¤ó¤ÊÎϤDz¶¤òÅݤ½¤¦¤È¤Ï¡ª¡×
520 +%E
521 +%Cp Fig 00067
522 +¡Ö%l¤Ç¤Ê¤±¤ì¤Ð²¶¤ÏÅݤ»¤ó¡ª¡×
523 +%E
524 +%Cp Fig 00068
525 +¡Ö¤³¤ó¤Ê¤ä¤Ä¤·¤«¤¤¤Ê¤¤¤È¤Ï%c¤âÍî¤Á¤¿¤â¤Î¤À¡ª¡×
526 +%E
527 +%Cp Fig 00069
528 +¡Ö»à¤Í¡ª%c¤è¡¥¡×
529 +%E
530 +%Cc Fig 00070
531 +%o¤ÎÎϤ¬ÂΤËÃí¤¬¤ì¤¿¡ª¤Ê¤ó¤ÈÁÇÀ²¤é¤·¤¤¥Ñ¥ï¡¼¤Ê¤Î¤À¡ª
532 +¤¢¤Ê¤¿¤Ï%l¤Î¸µ¤ØÆ»¤òµÞ¤¤¤À¡ª
533 +%E
534 +%Cp Fig 00080
535 +¡Ö¤³¤Î»ä¤¬¡¥¡¥¡¥¡¥¡×
536 +
537 +ÃÇËöËâ¤Î¶«¤Ó¤È¤È¤â¤Ë%n¤ÎÂΤÏÊø¤ìÍî¤Á¤¿¡¥
538 +%E
539 +%Cc Fig 00081
540 +%l¤ÏÈù¾Ð¤ß·Ú¤¯%o¤Ë¿¨¤ì¤¿¡¥
541 +
542 +¡Ö´èÄ¥¤Ã¤¿¤ï¤Í%p¡¥¤³¤ì¤Ç%n¤Î´íµ¡¤Ï¤Ê¤¯¤Ê¤Ã¤¿¤ï¡¥
543 +
544 +¡Ö¤Ç¤â%o¤Ï¤¢¤¿¤·¤è¤ê¤¢¤Ê¤¿¤Ë¤Õ¤µ¤ï¤·¤¤¤È»×¤¦¤Î¡¥
545 +  ¤À¤«¤é»ý¤Ã¤Æ¤¤¤Ã¤Æ¡¥¤¢¤¿¤·¤Ê¤éÂç¾æÉס¥¤À¤Ã¤Æ¿´¶¯¤¤Ãç´Ö¤¬¤¤¤ë¤ó¤Ç
546 +  ¤¹¤â¤Î¡×
547 +%E
548 +%Cc Fig 00082
549 +%l¤Ï%o¤ò¤Ê¤ó¤È¤«ÄϤߡ¤¤¢¤Ê¤¿¤ËÊÖ¤·¤¿¡¥
550 +
551 +¡Ö%o¤Ï¤¢¤Ê¤¿¤Î¤â¤Î¤è¡¥
552 +  Ëâ½ü¤±Ãµº÷¤òºÆ³«¤¹¤ë¤Î¤Ë»È¤Ã¤Æ¤Í¡¥
553 +%E
554 +%Cp Fig 00090
555 +¡Ö¤ªµ×¤·¤Ö¤ê%p¡¥¤¢¤¿¤·¤¿¤Á¤ÏÁêÊѤï¤é¤º¤è¡¥¡×
556 +%E
557 +%Cc Fig 00091
558 +¡Ö¤ª¤á¤Ç¤È¤¦%p¡ª¤Þ¤µ¤«Ëâ½ü¤±¤Þ¤Ç¼ê¤ËÆþ¤ì¤ë¤Ê¤ó¤Æ¡×
559 +
560 +¡ÖËâ½ü¤±¤ò»ý¤Ã¤ÆÀºÎ¤Ø¤¤¤¯¤È¤¤¤¤¤ï¡¥¤½¤·¤Æ%d¤Îº×ÃŤË
561 +  ¤µ¤µ¤²¤ë¤Î¡¥±þ±ç¤·¤Æ¤¤¤ë¤«¤é¤Í¡¥¡×
562 +%E
563 +#
564  #      Healer
565  #
566  %Cc Hea 00001
567 diff -urN JNH34302SJIS/dat/jtrnsmon.dat Fig34302/dat/jtrnsmon.dat
568 --- JNH34302SJIS/dat/jtrnsmon.dat       Sun Feb 29 13:03:06 2004
569 +++ Fig34302/dat/jtrnsmon.dat   Thu Mar 18 21:30:58 2004
570 @@ -521,6 +521,7 @@
571  Barbarian:             ÌîÈÚ¿Í:
572  Caveman:               Æ¶·¢¿Í:
573  Cavewoman:             Æ¶·¢¿Í:
574 +Fighter:               Àï»Î:
575  Healer:                        Ìô»Õ:
576  Knight:                        µ³»Î:
577  Monk:                  ÉðÆ®²È:
578 @@ -536,6 +537,7 @@
579  barbarian:             ÌîÈÚ¿Í:
580  caveman:               Æ¶·¢¿Í:
581  cavewoman:             Æ¶·¢¿Í:
582 +fighter:               Àï»Î:
583  elf:                   ¥¨¥ë¥Õ:
584  healer:                        Ìô»Õ:
585  knight:                        µ³»Î:
586 @@ -554,6 +556,7 @@
587  Lord Carnarvon:                ¥±¥Ê¡¼¥ô¥§¥ó¶ª:
588  Pelias:                        ¥Ô¡¼¥ê¥¨¥¹:
589  Shaman Karnov:         ¼ö½Ñ»Õ¥«¥ë¥Î¥Õ:
590 +Princess of Moon:      ¥×¥ê¥ó¥»¥¹:
591  Hippocrates:           ¥Ò¥Ý¥¯¥é¥Æ¥¹:
592  King Arthur:           ¥¢¡¼¥µ¡¼²¦:
593  Grand Master:          Áí»ÕÈÏ:
594 @@ -570,6 +573,7 @@
595  Minion of Huhetotl:    ¥Õ¥Ø¥È¥È¥ë¤Î»È¤¤:
596  Thoth Amon:            ¥È¡¼¥È¡¦¥¢¥â¥ó:
597  Chromatic Dragon:      ¥¯¥í¥Þ¥Æ¥£¥Ã¥¯¡¦¥É¥é¥´¥ó:
598 +Jedeite:               ¥¸¥§¥À¥¤¥È:
599  Cyclops:               ¥µ¥¤¥¯¥í¥×¥¹:
600  Ixoth:                 ¥¤¥¯¥½¥¹:
601  Master Kaen:           ¥«¥¨¥ó:
602 @@ -586,6 +590,7 @@
603  student:               ³ØÀ¸:
604  chieftain:             ¼óÎÎ:
605  neanderthal:           ¥Í¥¢¥ó¥Ç¥ë¥¿¡¼¥ë¿Í:
606 +planetary fighter:     ¼é¸îÀï»Î:
607  attendant:             ¿ï¹Ô°÷:
608  page:                  ¾®À«:
609  abbot:                 »ÕÈÏ:
610 @@ -611,6 +616,9 @@
611  Anu:                   ¥¢¥Ì:
612  Ishtar:                        ¥¤¥·¥å¥¿¥ë:
613  Anshar:                        ¥¢¥ó¥·¥ã¥ë:
614 +Selene:                        ¥»¥ì¥Í:
615 +Helios:                        ¥Ø¥ê¥ª¥¹:
616 +Eos:                   ¥¨¥ª¥¹:
617  Athena:                        ¥¢¥Æ¥Ê:
618  Hermes:                        ¥Ø¥ë¥á¥¹:
619  Poseidon:              ¥Ý¥»¥¤¥É¥ó:     
620 diff -urN JNH34302SJIS/dat/jtrnsobj.dat Fig34302/dat/jtrnsobj.dat
621 --- JNH34302SJIS/dat/jtrnsobj.dat       Sun Feb 29 13:03:10 2004
622 +++ Fig34302/dat/jtrnsobj.dat   Thu Mar 18 21:32:10 2004
623 @@ -183,6 +183,7 @@
624  ]crude ring mail:      ÁÆËö¤ÊÅ´´Ä¤Î³»:
625  ]leather armor:                ³×³»:
626  ]leather jacket:       ³×¤ÎÉþ:
627 +]sailor blouse:                ¥»¡¼¥é¡¼Éþ:
628  #
629  #      cloaks
630  #
631 @@ -831,6 +832,8 @@
632  AThe Heart of Ahriman:         ¥¢¡¼¥ê¥Þ¥ó¤Î¿´Â¡:
633  # C
634  AThe Sceptre of Might:         ¸¢ÎϤÎãô:
635 +# F
636 +AThe Silver Crystal:           ¸¸¤Î¶ä¿å¾½:
637  # H
638  AThe Staff of Aesculapius:     ¥¢¥¨¥¹¥­¥å¥é¥Ô¥¹¤Î¾ó:
639  # K
640 diff -urN JNH34302SJIS/include/artilist.h Fig34302/include/artilist.h
641 --- JNH34302SJIS/include/artilist.h     Thu Mar  6 16:40:54 2003
642 +++ Fig34302/include/artilist.h Thu Mar 18 21:36:18 2004
643 @@ -176,6 +176,15 @@
644         TAMING,         A_CHAOTIC, NON_PM , PM_ELF, 8000L ),
645  #endif
646  
647 +#ifdef FIGHTER
648 +A("The Silver Crystal",                        DILITHIUM_CRYSTAL,
649 +       (SPFX_NOGEN|SPFX_RESTR|SPFX_INTEL),
650 +               (SPFX_ESP|SPFX_REGEN|SPFX_DBONUS), 0,
651 +       NO_ATTK,        NO_DFNS,        CARY(AD_MAGM),
652 +       HEALING,        A_LAWFUL, PM_FIGHTER, NON_PM, 8000L ),
653 +#endif
654 +
655 +
656  A("The Staff of Aesculapius",  QUARTERSTAFF,
657         (SPFX_NOGEN|SPFX_RESTR|SPFX_ATTK|SPFX_INTEL|SPFX_DRLI|SPFX_REGEN), 0,0,
658         DRLI(0,0),      DRLI(0,0),      NO_CARY,
659 diff -urN JNH34302SJIS/include/config.h Fig34302/include/config.h
660 --- JNH34302SJIS/include/config.h       Sat Jan 10 19:06:48 2004
661 +++ Fig34302/include/config.h   Thu Mar 18 21:39:06 2004
662 @@ -153,6 +153,7 @@
663  /*#define NH_EXTENSION*/       /* Some extension for game */
664  # define XI18N
665  # define INSTALLCOLORMAP
666 +# define FIGHTER               /* Sailor Fighter with sailor blouse */
667  #endif
668  
669  #ifndef WIZARD         /* allow for compile-time or Makefile changes */
670 diff -urN JNH34302SJIS/src/attrib.c Fig34302/src/attrib.c
671 --- JNH34302SJIS/src/attrib.c   Sun Feb 29 12:52:30 2004
672 +++ Fig34302/src/attrib.c       Thu Mar 18 21:42:16 2004
673 @@ -68,6 +68,11 @@
674                      {  15, &(HWarning), "ÉÒ´¶¤Ë¤Ê¤Ã¤¿", "Æß´¶¤Ë¤Ê¤Ã¤¿" },
675                      {   0, 0, 0, 0 } },
676  
677 +#ifdef FIGHTER
678 +       fig_abil[] = { {         7, &(HFast), "ÁÇÁᤵ¤òÆÀ¤¿", "ÃÙ¤¯¤Ê¤Ã¤¿" },
679 +                    {   0, 0, 0, 0 } },
680 +
681 +#endif
682         hea_abil[] = { {         1, &(HPoison_resistance), "", "" },
683  /*JP
684                      {  15, &(HWarning), "sensitive", "" },
685 @@ -671,6 +676,9 @@
686         case PM_ARCHEOLOGIST:   abil = arc_abil;        break;
687         case PM_BARBARIAN:      abil = bar_abil;        break;
688         case PM_CAVEMAN:        abil = cav_abil;        break;
689 +#ifdef FIGHTER
690 +       case PM_FIGHTER:        abil = fig_abil;        break;
691 +#endif
692         case PM_HEALER:         abil = hea_abil;        break;
693         case PM_KNIGHT:         abil = kni_abil;        break;
694         case PM_MONK:           abil = mon_abil;        break;
695 diff -urN JNH34302SJIS/src/do_wear.c Fig34302/src/do_wear.c
696 --- JNH34302SJIS/src/do_wear.c  Sun Feb 29 12:48:02 2004
697 +++ Fig34302/src/do_wear.c      Thu Mar 18 21:45:26 2004
698 @@ -672,6 +672,16 @@
699  int
700  Armor_on()
701  {
702 +#ifdef FIGHTER
703 +  switch(uarm->otyp) {
704 +  case SAILOR_BLOUSE:
705 +      if(flags.female/* || Role_is('F'*/)
706 +         ;
707 +      else
708 +         curse(uarm);
709 +      break;
710 +  }
711 +#endif
712      return 0;
713  }
714  
715 @@ -1794,6 +1804,9 @@
716         } else {
717                 if(is_cloak(otmp)) (void) Cloak_on();
718                 if (is_shield(otmp)) (void) Shield_on();
719 +#ifdef FIGHTER
720 +               if(otmp == uarm) (void) Armor_on();
721 +#endif
722  #ifdef TOURIST
723                 if (is_shirt(otmp)) (void) Shirt_on();
724  #endif
725 diff -urN JNH34302SJIS/src/dog.c Fig34302/src/dog.c
726 --- JNH34302SJIS/src/dog.c      Sun Feb 29 12:53:22 2004
727 +++ Fig34302/src/dog.c  Thu Mar 18 21:48:02 2004
728 @@ -180,6 +180,11 @@
729             if(Role_if(PM_RANGER)) petname = "¥·¥ê¥¦¥¹";
730  #endif /*JP*/
731         }
732 +#ifdef FIGHTER
733 +       if (!*petname && pettype == PM_KITTEN) {
734 +           if(Role_if(PM_FIGHTER)) petname = rn2(2) ? "¥ë¥Ê" : "¥¢¥ë¥Æ¥ß¥¹";
735 +       }
736 +#endif
737  
738         mtmp = makemon(&mons[pettype], u.ux, u.uy, MM_EDOG);
739  
740 diff -urN JNH34302SJIS/src/makemon.c Fig34302/src/makemon.c
741 --- JNH34302SJIS/src/makemon.c  Sun Feb 29 12:56:46 2004
742 +++ Fig34302/src/makemon.c      Thu Mar 18 21:54:02 2004
743 @@ -1091,6 +1091,42 @@
744             if (mtmp->minvent) discard_minvent(mtmp);
745             mtmp->minvent = (struct obj *)0;    /* caller expects this */
746         }
747 +#ifdef FIGHTER
748 +       if(ptr == &mons[PM_PLANETARY_FIGHTER]){
749 +         static int uniq_num = 0;
750 +         const char *cn;
751 +/*Àï»Î¤ÏÁ´¤Æ½÷À­¤ÇÏÇÀ±¤Î̾Á°¤ò»ý¤Ä*/
752 +         mtmp->female = 1;
753 +         switch(uniq_num){
754 +         case 0:
755 +           cn = "¥Þ¡¼¥­¥å¥ê¡¼";
756 +           break;
757 +         case 1:
758 +           cn = "¥ô¥£¡¼¥Ê¥¹";
759 +           break;
760 +         case 2:
761 +           cn = "¥Þ¡¼¥º";
762 +           break;
763 +         case 3:
764 +           cn = "¥¸¥å¥Ô¥¿¡¼";
765 +           break;
766 +         case 4:
767 +           cn = "¥¦¥é¥Ì¥¹";
768 +           break;
769 +         case 5:
770 +           cn = "¥Í¥×¥Á¥å¡¼¥ó";
771 +           break;
772 +         case 6:
773 +           cn = "¥×¥ë¡¼¥È";
774 +           break;
775 +         default:
776 +           cn = "¥µ¥¿¡¼¥ó";
777 +           break;
778 +         }
779 +         ++uniq_num;
780 +         christen_monst(mtmp, cn);
781 +       }
782 +#endif
783         if ((ptr->mflags3 & M3_WAITMASK) && !(mmflags & MM_NOWAIT)) {
784                 if (ptr->mflags3 & M3_WAITFORU)
785                         mtmp->mstrategy |= STRAT_WAITFORU;
786 diff -urN JNH34302SJIS/src/monst.c Fig34302/src/monst.c
787 --- JNH34302SJIS/src/monst.c    Wed Dec 10 12:50:16 2003
788 +++ Fig34302/src/monst.c        Thu Mar 18 22:04:08 2004
789 @@ -2951,6 +2951,15 @@
790         M1_HUMANOID|M1_OMNIVORE,
791         M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_FEMALE|M2_COLLECT, M3_INFRAVISIBLE,
792         HI_DOMESTIC),
793 +#ifdef FIGHTER
794 +    MON("fighter", S_HUMAN,
795 +       LVL(10, 12, 10, 2, 3), G_NOGEN,
796 +       A(ATTK(AT_WEAP, AD_PHYS, 1, 8),
797 +         NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
798 +       SIZ(WT_ELF, 350, 0, MS_HUMANOID, MZ_HUMAN), 0, 0,
799 +       M1_HUMANOID|M1_OMNIVORE,
800 +       M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_COLLECT, M3_INFRAVISIBLE, HI_DOMESTIC),
801 +#endif
802      MON("healer", S_HUMAN,
803         LVL(10, 12, 10, 1, 0), G_NOGEN,
804         A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
805 @@ -3089,6 +3098,17 @@
806           M2_FEMALE|M2_COLLECT|M2_MAGIC,
807         M3_CLOSE|M3_INFRAVISION|M3_INFRAVISIBLE, HI_LORD),
808  #endif
809 +#ifdef FIGHTER
810 +    MON("Princess of Moon", S_HUMAN,
811 +       LVL(20, 15, 0, 80, 20), (G_NOGEN|G_UNIQ),
812 +       A(ATTK(AT_WEAP, AD_PHYS, 1, 8),
813 +         NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
814 +       SIZ(WT_HUMAN, 400, 0, MS_LEADER, MZ_HUMAN), MR_COLD, 0,
815 +       M1_HUMANOID|M1_OMNIVORE,
816 +       M2_NOPOLY|M2_HUMAN|M2_PEACEFUL|M2_STRONG|M2_FEMALE|
817 +         M2_COLLECT|M2_MAGIC,
818 +       M3_CLOSE|M3_INFRAVISIBLE, HI_LORD),
819 +#endif
820      MON("Hippocrates", S_HUMAN,
821         LVL(20, 12, 0, 40, 0), (G_NOGEN|G_UNIQ),
822         A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
823 @@ -3233,6 +3253,17 @@
824           M2_GREEDY|M2_JEWELS|M2_COLLECT|M2_MAGIC,
825         M3_WANTSARTI|M3_WAITFORU|M3_INFRAVISION|M3_INFRAVISIBLE, HI_LORD),
826  #endif
827 +#ifdef FIGHTER
828 +    MON("Jedeite", S_HUMAN,
829 +       LVL(15, 10, 10, 0, -15), (G_NOGEN|G_UNIQ),
830 +       A(ATTK(AT_WEAP, AD_PHYS, 2, 6), ATTK(AT_WEAP, AD_PHYS, 2, 6),
831 +         ATTK(AT_CLAW, AD_SAMU, 1, 6), NO_ATTK, NO_ATTK, NO_ATTK),
832 +       SIZ(750, 350, 0, MS_NEMESIS, MZ_HUMAN), 0, 0,
833 +       M1_HUMANOID|M1_OMNIVORE,
834 +       M2_NOPOLY|M2_ORC|M2_HOSTILE|M2_STRONG|M2_STALK|M2_NASTY|M2_MALE|
835 +         M2_GREEDY|M2_JEWELS|M2_COLLECT|M2_MAGIC,
836 +       M3_WANTSARTI|M3_WAITFORU|M3_INFRAVISION, HI_LORD),
837 +#endif
838      MON("Cyclops", S_GIANT,
839         LVL(18, 12, 0, 0, -15), (G_NOGEN|G_UNIQ),
840         A(ATTK(AT_WEAP, AD_PHYS, 4, 8), ATTK(AT_WEAP, AD_PHYS, 4, 8),
841 @@ -3365,6 +3396,16 @@
842         M2_NOPOLY|M2_ELF|M2_PEACEFUL|M2_COLLECT,
843         M3_INFRAVISION|M3_INFRAVISIBLE, HI_DOMESTIC),
844  #endif
845 +#ifdef FIGHTER
846 +    MON("planetary fighter", S_HUMAN,
847 +       LVL(5, 12, 10, 10, 7), G_NOGEN,
848 +       A(ATTK(AT_WEAP, AD_PHYS, 2, 4), ATTK(AT_MAGC, AD_CLRC, 0, 0),
849 +         NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
850 +       SIZ(WT_HUMAN, 350, 0, MS_GUARDIAN, MZ_HUMAN), MR_SLEEP, MR_SLEEP,
851 +       M1_HUMANOID|M1_SEE_INVIS|M1_OMNIVORE,
852 +       M2_NOPOLY|M2_HUMAN|M2_PEACEFUL|M2_COLLECT, M3_INFRAVISIBLE,
853 +       HI_DOMESTIC),
854 +#endif
855      MON("attendant", S_HUMAN,
856         LVL(5, 12, 10, 10, 3), G_NOGEN,
857         A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
858 diff -urN JNH34302SJIS/src/mplayer.c Fig34302/src/mplayer.c
859 --- JNH34302SJIS/src/mplayer.c  Sun Feb 29 12:58:04 2004
860 +++ Fig34302/src/mplayer.c      Thu Mar 18 22:10:50 2004
861 @@ -190,6 +190,14 @@
862                     else if (rn2(2)) weapon = CLUB;
863                     if (helm == HELM_OF_BRILLIANCE) helm = STRANGE_OBJECT;
864                     break;
865 +#ifdef FIGHTER
866 +               case PM_FIGHTER:
867 +                   weapon = SHORT_SWORD;
868 +                   armor = SAILOR_BLOUSE;
869 +                   if (rn2(4)) helm = HELM_OF_BRILLIANCE;
870 +                   if (rn2(2)) shield = STRANGE_OBJECT;
871 +                   break;
872 +#endif
873                 case PM_HEALER:
874                     if (rn2(4)) weapon = QUARTERSTAFF;
875                     else if (rn2(2)) weapon = rn2(2) ? UNICORN_HORN : SCALPEL;
876 diff -urN JNH34302SJIS/src/objects.c Fig34302/src/objects.c
877 --- JNH34302SJIS/src/objects.c  Fri Dec  5 01:21:28 2003
878 +++ Fig34302/src/objects.c      Thu Mar 18 22:15:32 2004
879 @@ -392,8 +392,15 @@
880         1, 0, 0, 0,     72, 5, 250, 100,  7, 0, ARM_SUIT, IRON, HI_METAL),
881  ARMOR("orcish ring mail", "crude ring mail",
882         0, 0, 0, 0,     20, 5, 250,  80,  8, 1, ARM_SUIT, IRON, CLR_BLACK),
883 +#ifdef FIGHTER
884 +ARMOR("leather armor", (char *)0,
885 +       1, 0, 0, 0,     70, 3, 150,   5,  8, 0, ARM_SUIT, LEATHER, HI_LEATHER),
886 +ARMOR("sailor blouse", (char *)0,
887 +       1, 0, 0, 0,     12, 0,  30, 200,  7, 0, ARM_SUIT, CLOTH, CLR_WHITE),
888 +#else
889  ARMOR("leather armor", (char *)0,
890         1, 0, 0, 0,     82, 3, 150,   5,  8, 0, ARM_SUIT, LEATHER, HI_LEATHER),
891 +#endif
892  ARMOR("leather jacket", (char *)0,
893         1, 0, 0, 0,     12, 0,  30,  10,  9, 0, ARM_SUIT, LEATHER, CLR_BLACK),
894  
895 diff -urN JNH34302SJIS/src/role.c Fig34302/src/role.c
896 --- JNH34302SJIS/src/role.c     Sun Feb 29 13:00:26 2004
897 +++ Fig34302/src/role.c Thu Mar 18 22:18:14 2004
898 @@ -155,6 +155,36 @@
899         {  1, 0,  0, 1,  0, 1 },10,     /* Energy */
900         0, 12, 0, 1,  8, A_INT, SPE_DIG,             -4
901  },
902 +#ifdef FIGHTER
903 +{      {"Fighter", 0}, 
904 +       {"Àï»Î", 0}, {
905 +       {"¥Þ¡¼¥­¥å¥ê¡¼",0},
906 +       {"¥Ó¡¼¥Ê¥¹",    0},
907 +       {"¥Þ¡¼¥º",      0},
908 +       {"¥¸¥å¥Ô¥¿¡¼",  0},
909 +       {"¥µ¥¿¡¼¥ó",    0},
910 +       {"¥¦¥é¥Ì¥¹",    0},
911 +       {"¥Í¥×¥Á¥å¡¼¥ó",0},
912 +       {"¥×¥ë¡¼¥È",    0},
913 +       {"¥à¡¼¥ó",      0} },
914 +       "Selene", "Helios", "Eos",
915 +       "Fig", "·î¤ÎµÜÅÂ",
916 +           "Ãϵå",
917 +       PM_FIGHTER, NON_PM, PM_KITTEN,
918 +        PM_PRINCESS_OF_MOON, PM_PLANETARY_FIGHTER, PM_JEDEITE,
919 +       PM_EARTH_ELEMENTAL, PM_SNAKE, S_SNAKE, S_ZOMBIE,
920 +       ART_SILVER_CRYSTAL,
921 +       MH_HUMAN | ROLE_FEMALE |
922 +         ROLE_LAWFUL| ROLE_CHAOTIC,
923 +       /* Str Int Wis Dex Con Cha */
924 +       {  10, 10,  6, 12, 12, 18 },
925 +       {  30, 10, 10, 20, 20, 10 },
926 +       /* Init   Lower  Higher */
927 +       { 12, 0,  0, 8,  1, 0 },        /* Hit points */
928 +       {  2, 2,  0, 2,  0, 2 },10,     /* Energy */
929 +       0, 1, 1, 10, 20, A_CHA, SPE_CHARM_MONSTER, -4
930 +},
931 +#endif
932  {      {"Healer", 0}, 
933         {"Ìô»Õ", 0}, {
934  #if 0 /*JP*/
935 diff -urN JNH34302SJIS/src/shk.c Fig34302/src/shk.c
936 --- JNH34302SJIS/src/shk.c      Sun Feb 29 13:00:40 2004
937 +++ Fig34302/src/shk.c  Thu Mar 18 22:24:04 2004
938 @@ -2244,6 +2244,14 @@
939                 } else if (!(obj->o_id % 4)) /* arbitrarily impose surcharge */
940                     tmp += tmp / 3L;
941         }
942 +#ifdef FIGHTER
943 +       if (obj->otyp == SAILOR_BLOUSE){
944 +         if (!flags.female)
945 +           tmp *= 15;
946 +         else
947 +           tmp *= 10;
948 +       }
949 +#endif
950  #ifdef TOURIST
951         if ((Role_if(PM_TOURIST) && u.ulevel < (MAXULEV/2))
952             || (uarmu && !uarm && !uarmc))      /* touristy shirt visible */
953 @@ -2370,6 +2378,16 @@
954  {
955         long tmp = getprice(obj, TRUE) * obj->quan;
956  
957 +#ifdef FIGHTER
958 +       if (obj->otyp == SAILOR_BLOUSE){
959 +           if (flags.female/* && Role_is('F')*/)
960 +               tmp *= 10;
961 +           else if (flags.female)
962 +               tmp *= 5;
963 +/*         else if (!Role_is('F'))
964 +           tmp = 0;*/
965 +       }
966 +#endif
967  #ifdef TOURIST
968         if ((Role_if(PM_TOURIST) && u.ulevel < (MAXULEV/2))
969             || (uarmu && !uarm && !uarmc))      /* touristy shirt visible */
970 diff -urN JNH34302SJIS/src/u_init.c Fig34302/src/u_init.c
971 --- JNH34302SJIS/src/u_init.c   Wed Dec 10 12:50:16 2003
972 +++ Fig34302/src/u_init.c       Thu Mar 18 22:34:18 2004
973 @@ -55,6 +55,15 @@
974         { LEATHER_ARMOR, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
975         { 0, 0, 0, 0, 0 }
976  };
977 +#ifdef FIGHTER
978 +static struct trobj Fighter[] = {
979 +       { SHORT_SWORD, 2, WEAPON_CLASS, 1, 1 },
980 +       { SAILOR_BLOUSE, 1, ARMOR_CLASS, 1, UNDEF_BLESS },
981 +       { WAN_POLYMORPH, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
982 +       { UNDEF_TYP, UNDEF_SPE, SCROLL_CLASS, 3, UNDEF_BLESS },
983 +       { 0, 0, 0, 0, 0 }
984 +};
985 +#endif /* FIGHTER */
986  static struct trobj Healer[] = {
987         { SCALPEL, 0, WEAPON_CLASS, 1, UNDEF_BLESS },
988         { LEATHER_GLOVES, 1, ARMOR_CLASS, 1, UNDEF_BLESS },
989 @@ -303,6 +312,21 @@
990      { P_NONE, 0 }
991  };
992  
993 +#ifdef FIGHTER
994 +static struct def_skill Skill_F[] = {
995 +    { P_DAGGER, P_EXPERT },            { P_KNIFE, P_SKILLED },
996 +    { P_SHORT_SWORD, P_EXPERT },       { P_BROAD_SWORD, P_EXPERT },
997 +    { P_LONG_SWORD, P_SKILLED },       { P_TWO_HANDED_SWORD, P_BASIC },
998 +    { P_SCIMITAR, P_SKILLED },         { P_SABER, P_SKILLED },
999 +    { P_SPEAR, P_EXPERT },             { P_JAVELIN, P_BASIC },
1000 +    { P_BOW, P_EXPERT },               { P_SLING, P_BASIC },
1001 +    { P_CROSSBOW, P_BASIC },           { P_SHURIKEN, P_BASIC },
1002 +    { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_MARTIAL_ARTS, P_MASTER },
1003 +    { P_ENCHANTMENT_SPELL, P_SKILLED },
1004 +    { P_NONE, 0 }
1005 +};
1006 +#endif /* FIGHTER */
1007 +
1008  static const struct def_skill Skill_H[] = {
1009      { P_DAGGER, P_SKILLED },           { P_KNIFE, P_EXPERT },
1010      { P_SHORT_SWORD, P_SKILLED },      { P_SCIMITAR, P_BASIC },
1011 @@ -628,6 +652,15 @@
1012                 ini_inv(Cave_man);
1013                 skill_init(Skill_C);
1014                 break;
1015 +#ifdef FIGHTER
1016 +       case PM_FIGHTER:
1017 +               u.uen = u.uenmax += rn1(4, 1);
1018 +               ini_inv(Fighter);
1019 +               skill_init(Skill_F);
1020 +               knows_class(WEAPON_CLASS);
1021 +               knows_class(ARMOR_CLASS);
1022 +               break;
1023 +#endif
1024         case PM_HEALER:
1025  #ifndef GOLDOBJ
1026                 u.ugold = u.ugold0 = rn1(1000, 1001);
1027 diff -urN JNH34302SJIS/src/weapon.c Fig34302/src/weapon.c
1028 --- JNH34302SJIS/src/weapon.c   Sun Feb 29 13:02:06 2004
1029 +++ Fig34302/src/weapon.c       Thu Mar 18 22:35:48 2004
1030 @@ -1383,6 +1383,12 @@
1031                 P_SKILL(P_ATTACK_SPELL) = P_BASIC;
1032                 P_SKILL(P_ENCHANTMENT_SPELL) = P_BASIC;
1033         }
1034 +/*JP*/
1035 +#ifdef FIGHTER
1036 +       else if(Role_if(PM_FIGHTER)){
1037 +               P_SKILL(P_ENCHANTMENT_SPELL) = P_BASIC;
1038 +       }
1039 +#endif
1040  
1041         /* walk through array to set skill maximums */
1042         for (; class_skill->skill != P_NONE; class_skill++) {
1043 diff -urN JNH34302SJIS/sys/msdos/Makefile.GCC Fig34302/sys/msdos/Makefile.GCC
1044 --- JNH34302SJIS/sys/msdos/Makefile.GCC Thu Sep  4 04:05:10 2003
1045 +++ Fig34302/sys/msdos/Makefile.GCC     Thu Mar 18 22:43:42 2004
1046 @@ -908,7 +908,7 @@
1047         $(DAT)/caveman.des   $(DAT)/healer.des   $(DAT)/knight.des \
1048         $(DAT)/monk.des      $(DAT)/priest.des   $(DAT)/ranger.des \
1049         $(DAT)/rogue.des     $(DAT)/samurai.des  $(DAT)/tourist.des \
1050 -       $(DAT)/valkyrie.des  $(DAT)/wizard.des
1051 +       $(DAT)/valkyrie.des  $(DAT)/wizard.des  $(DAT)/fighter.des
1052         @$(subst /,\,cd $(DAT))
1053         @$(subst /,\,$(U)lev_comp bigroom.des)
1054         @$(subst /,\,$(U)lev_comp castle.des)
1055 @@ -934,6 +934,7 @@
1056         @$(subst /,\,$(U)lev_comp tourist.des)
1057         @$(subst /,\,$(U)lev_comp valkyrie.des)
1058         @$(subst /,\,$(U)lev_comp wizard.des)
1059 +       @$(subst /,\,$(U)lev_comp fighter.des)
1060         @$(subst /,\,cd $(SRC))
1061         @$(subst /,\,echo sp_levs done > $@)
1062  
1063 diff -urN JNH34302SJIS/sys/winnt/Makefile.bcc Fig34302/sys/winnt/Makefile.bcc
1064 --- JNH34302SJIS/sys/winnt/Makefile.bcc Wed Dec 10 12:50:20 2003
1065 +++ Fig34302/sys/winnt/Makefile.bcc     Thu Mar 18 22:48:46 2004
1066 @@ -563,6 +563,7 @@
1067         $(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des   \
1068         $(DAT)\medusa.des  $(DAT)\oracle.des   $(DAT)\tower.des  \
1069         $(DAT)\yendor.des  $(DAT)\arch.des     $(DAT)\barb.des   \
1070 +       $(DAT)\fighter.des \
1071         $(DAT)\caveman.des $(DAT)\healer.des   $(DAT)\knight.des \
1072         $(DAT)\monk.des    $(DAT)\priest.des   $(DAT)\ranger.des \
1073         $(DAT)\rogue.des   $(DAT)\samurai.des  $(DAT)\sokoban.des \
1074 @@ -581,6 +582,7 @@
1075         $(U)lev_comp yendor.des
1076         $(U)lev_comp arch.des
1077         $(U)lev_comp barb.des
1078 +       $(U)lev_comp fighter.des
1079         $(U)lev_comp caveman.des
1080         $(U)lev_comp healer.des
1081         $(U)lev_comp knight.des
1082 diff -urN JNH34302SJIS/sys/winnt/Makefile.gcc Fig34302/sys/winnt/Makefile.gcc
1083 --- JNH34302SJIS/sys/winnt/Makefile.gcc Wed Dec 10 12:50:20 2003
1084 +++ Fig34302/sys/winnt/Makefile.gcc     Thu Mar 18 22:50:14 2004
1085 @@ -521,6 +521,7 @@
1086          $(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des   \
1087          $(DAT)/medusa.des  $(DAT)/oracle.des   $(DAT)/tower.des  \
1088          $(DAT)/yendor.des  $(DAT)/arch.des     $(DAT)/barb.des   \
1089 +        $(DAT)\fighter.des \
1090          $(DAT)/caveman.des $(DAT)/healer.des   $(DAT)/knight.des \
1091          $(DAT)/monk.des    $(DAT)/priest.des   $(DAT)/ranger.des \
1092          $(DAT)/rogue.des   $(DAT)/samurai.des  $(DAT)/sokoban.des \
1093 @@ -538,6 +539,7 @@
1094         $(subst /,\,$(U)lev_comp $(DAT)/yendor.des)
1095         $(subst /,\,$(U)lev_comp $(DAT)/arch.des)
1096         $(subst /,\,$(U)lev_comp $(DAT)/barb.des)
1097 +       $(subst /,\,$(U)lev_comp $(DAT)/fighter.des)
1098         $(subst /,\,$(U)lev_comp $(DAT)/caveman.des)
1099         $(subst /,\,$(U)lev_comp $(DAT)/healer.des)
1100         $(subst /,\,$(U)lev_comp $(DAT)/knight.des)
1101 diff -urN JNH34302SJIS/sys/winnt/Makefile.msc Fig34302/sys/winnt/Makefile.msc
1102 --- JNH34302SJIS/sys/winnt/Makefile.msc Wed Dec 10 12:50:20 2003
1103 +++ Fig34302/sys/winnt/Makefile.msc     Thu Mar 18 22:46:50 2004
1104 @@ -501,6 +501,7 @@
1105         $(DAT)\endgame.des $(DAT)\gehennom.des $(DAT)\knox.des   \
1106         $(DAT)\medusa.des  $(DAT)\oracle.des   $(DAT)\tower.des  \
1107         $(DAT)\yendor.des  $(DAT)\arch.des     $(DAT)\barb.des   \
1108 +       $(DAT)\fighter.des \
1109         $(DAT)\caveman.des $(DAT)\healer.des   $(DAT)\knight.des \
1110         $(DAT)\monk.des    $(DAT)\priest.des   $(DAT)\ranger.des \
1111         $(DAT)\rogue.des   $(DAT)\samurai.des  $(DAT)\sokoban.des \
1112 @@ -519,6 +520,7 @@
1113         $(U)lev_comp yendor.des
1114         $(U)lev_comp arch.des
1115         $(U)lev_comp barb.des
1116 +       $(U)lev_comp fighter.des
1117         $(U)lev_comp caveman.des
1118         $(U)lev_comp healer.des
1119         $(U)lev_comp knight.des
1120 diff -urN JNH34302SJIS/util/makedefs.c Fig34302/util/makedefs.c
1121 --- JNH34302SJIS/util/makedefs.c        Sun Feb 29 12:49:48 2004
1122 +++ Fig34302/util/makedefs.c    Thu Mar 18 21:24:12 2004
1123 @@ -751,6 +751,9 @@
1124  #ifdef EXP_ON_BOTL
1125                 "experience points on status line",
1126  #endif
1127 +#ifdef FIGHTER
1128 +               "fighter",
1129 +#endif
1130  #ifdef MFLOPPY
1131                 "floppy drive support",
1132  #endif
About OSDN
Find Software
Develop Software
Help