変愚蛮怒のメインリポジトリです
Revision | e5f7c14d12d56551c63e443af67dac9cf469e587 (tree) |
---|---|
Time | 2003-12-17 05:21:42 |
Author | nothere <nothere@0568...> |
Commiter | nothere |
m_ptr->mlとis_original_ap(m_ptr)の組み合わせだった部分をさらにマクロ
is_original_ap_and_seen()として整理.
@@ -242,7 +242,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
242 | 242 | if ((have_flag(flgs, TR_SLAY_ANIMAL)) && |
243 | 243 | (r_ptr->flags3 & RF3_ANIMAL)) |
244 | 244 | { |
245 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
245 | + if (is_original_ap_and_seen(m_ptr)) | |
246 | 246 | { |
247 | 247 | r_ptr->r_flags3 |= RF3_ANIMAL; |
248 | 248 | } |
@@ -254,7 +254,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
254 | 254 | if ((have_flag(flgs, TR_KILL_ANIMAL)) && |
255 | 255 | (r_ptr->flags3 & RF3_ANIMAL)) |
256 | 256 | { |
257 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
257 | + if (is_original_ap_and_seen(m_ptr)) | |
258 | 258 | { |
259 | 259 | r_ptr->r_flags3 |= RF3_ANIMAL; |
260 | 260 | } |
@@ -266,7 +266,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
266 | 266 | if ((have_flag(flgs, TR_SLAY_EVIL)) && |
267 | 267 | (r_ptr->flags3 & RF3_EVIL)) |
268 | 268 | { |
269 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
269 | + if (is_original_ap_and_seen(m_ptr)) | |
270 | 270 | { |
271 | 271 | r_ptr->r_flags3 |= RF3_EVIL; |
272 | 272 | } |
@@ -278,7 +278,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
278 | 278 | if ((have_flag(flgs, TR_KILL_EVIL)) && |
279 | 279 | (r_ptr->flags3 & RF3_EVIL)) |
280 | 280 | { |
281 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
281 | + if (is_original_ap_and_seen(m_ptr)) | |
282 | 282 | { |
283 | 283 | r_ptr->r_flags3 |= RF3_EVIL; |
284 | 284 | } |
@@ -290,7 +290,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
290 | 290 | if ((have_flag(flgs, TR_SLAY_HUMAN)) && |
291 | 291 | (r_ptr->flags2 & RF2_HUMAN)) |
292 | 292 | { |
293 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
293 | + if (is_original_ap_and_seen(m_ptr)) | |
294 | 294 | { |
295 | 295 | r_ptr->r_flags2 |= RF2_HUMAN; |
296 | 296 | } |
@@ -302,7 +302,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
302 | 302 | if ((have_flag(flgs, TR_KILL_HUMAN)) && |
303 | 303 | (r_ptr->flags2 & RF2_HUMAN)) |
304 | 304 | { |
305 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
305 | + if (is_original_ap_and_seen(m_ptr)) | |
306 | 306 | { |
307 | 307 | r_ptr->r_flags2 |= RF2_HUMAN; |
308 | 308 | } |
@@ -314,7 +314,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
314 | 314 | if ((have_flag(flgs, TR_SLAY_UNDEAD)) && |
315 | 315 | (r_ptr->flags3 & RF3_UNDEAD)) |
316 | 316 | { |
317 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
317 | + if (is_original_ap_and_seen(m_ptr)) | |
318 | 318 | { |
319 | 319 | r_ptr->r_flags3 |= RF3_UNDEAD; |
320 | 320 | } |
@@ -326,7 +326,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
326 | 326 | if ((have_flag(flgs, TR_KILL_UNDEAD)) && |
327 | 327 | (r_ptr->flags3 & RF3_UNDEAD)) |
328 | 328 | { |
329 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
329 | + if (is_original_ap_and_seen(m_ptr)) | |
330 | 330 | { |
331 | 331 | r_ptr->r_flags3 |= RF3_UNDEAD; |
332 | 332 | } |
@@ -338,7 +338,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
338 | 338 | if ((have_flag(flgs, TR_SLAY_DEMON)) && |
339 | 339 | (r_ptr->flags3 & RF3_DEMON)) |
340 | 340 | { |
341 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
341 | + if (is_original_ap_and_seen(m_ptr)) | |
342 | 342 | { |
343 | 343 | r_ptr->r_flags3 |= RF3_DEMON; |
344 | 344 | } |
@@ -350,7 +350,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
350 | 350 | if ((have_flag(flgs, TR_KILL_DEMON)) && |
351 | 351 | (r_ptr->flags3 & RF3_DEMON)) |
352 | 352 | { |
353 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
353 | + if (is_original_ap_and_seen(m_ptr)) | |
354 | 354 | { |
355 | 355 | r_ptr->r_flags3 |= RF3_DEMON; |
356 | 356 | } |
@@ -362,7 +362,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
362 | 362 | if ((have_flag(flgs, TR_SLAY_ORC)) && |
363 | 363 | (r_ptr->flags3 & RF3_ORC)) |
364 | 364 | { |
365 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
365 | + if (is_original_ap_and_seen(m_ptr)) | |
366 | 366 | { |
367 | 367 | r_ptr->r_flags3 |= RF3_ORC; |
368 | 368 | } |
@@ -374,7 +374,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
374 | 374 | if ((have_flag(flgs, TR_KILL_ORC)) && |
375 | 375 | (r_ptr->flags3 & RF3_ORC)) |
376 | 376 | { |
377 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
377 | + if (is_original_ap_and_seen(m_ptr)) | |
378 | 378 | { |
379 | 379 | r_ptr->r_flags3 |= RF3_ORC; |
380 | 380 | } |
@@ -386,7 +386,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
386 | 386 | if ((have_flag(flgs, TR_SLAY_TROLL)) && |
387 | 387 | (r_ptr->flags3 & RF3_TROLL)) |
388 | 388 | { |
389 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
389 | + if (is_original_ap_and_seen(m_ptr)) | |
390 | 390 | { |
391 | 391 | r_ptr->r_flags3 |= RF3_TROLL; |
392 | 392 | } |
@@ -398,7 +398,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
398 | 398 | if ((have_flag(flgs, TR_KILL_TROLL)) && |
399 | 399 | (r_ptr->flags3 & RF3_TROLL)) |
400 | 400 | { |
401 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
401 | + if (is_original_ap_and_seen(m_ptr)) | |
402 | 402 | { |
403 | 403 | r_ptr->r_flags3 |= RF3_TROLL; |
404 | 404 | } |
@@ -410,7 +410,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
410 | 410 | if ((have_flag(flgs, TR_SLAY_GIANT)) && |
411 | 411 | (r_ptr->flags3 & RF3_GIANT)) |
412 | 412 | { |
413 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
413 | + if (is_original_ap_and_seen(m_ptr)) | |
414 | 414 | { |
415 | 415 | r_ptr->r_flags3 |= RF3_GIANT; |
416 | 416 | } |
@@ -422,7 +422,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
422 | 422 | if ((have_flag(flgs, TR_KILL_GIANT)) && |
423 | 423 | (r_ptr->flags3 & RF3_GIANT)) |
424 | 424 | { |
425 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
425 | + if (is_original_ap_and_seen(m_ptr)) | |
426 | 426 | { |
427 | 427 | r_ptr->r_flags3 |= RF3_GIANT; |
428 | 428 | } |
@@ -434,7 +434,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
434 | 434 | if ((have_flag(flgs, TR_SLAY_DRAGON)) && |
435 | 435 | (r_ptr->flags3 & RF3_DRAGON)) |
436 | 436 | { |
437 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
437 | + if (is_original_ap_and_seen(m_ptr)) | |
438 | 438 | { |
439 | 439 | r_ptr->r_flags3 |= RF3_DRAGON; |
440 | 440 | } |
@@ -446,7 +446,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
446 | 446 | if ((have_flag(flgs, TR_KILL_DRAGON)) && |
447 | 447 | (r_ptr->flags3 & RF3_DRAGON)) |
448 | 448 | { |
449 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
449 | + if (is_original_ap_and_seen(m_ptr)) | |
450 | 450 | { |
451 | 451 | r_ptr->r_flags3 |= RF3_DRAGON; |
452 | 452 | } |
@@ -463,7 +463,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
463 | 463 | /* Notice immunity */ |
464 | 464 | if (r_ptr->flagsr & RFR_EFF_IM_ACID_MASK) |
465 | 465 | { |
466 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
466 | + if (is_original_ap_and_seen(m_ptr)) | |
467 | 467 | { |
468 | 468 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ACID_MASK); |
469 | 469 | } |
@@ -482,7 +482,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
482 | 482 | /* Notice immunity */ |
483 | 483 | if (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK) |
484 | 484 | { |
485 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
485 | + if (is_original_ap_and_seen(m_ptr)) | |
486 | 486 | { |
487 | 487 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK); |
488 | 488 | } |
@@ -510,7 +510,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
510 | 510 | /* Notice immunity */ |
511 | 511 | if (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK) |
512 | 512 | { |
513 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
513 | + if (is_original_ap_and_seen(m_ptr)) | |
514 | 514 | { |
515 | 515 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK); |
516 | 516 | } |
@@ -522,7 +522,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
522 | 522 | if (r_ptr->flags3 & RF3_HURT_FIRE) |
523 | 523 | { |
524 | 524 | if (mult < 70) mult = 70; |
525 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
525 | + if (is_original_ap_and_seen(m_ptr)) | |
526 | 526 | { |
527 | 527 | r_ptr->r_flags3 |= RF3_HURT_FIRE; |
528 | 528 | } |
@@ -534,7 +534,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
534 | 534 | if (r_ptr->flags3 & RF3_HURT_FIRE) |
535 | 535 | { |
536 | 536 | if (mult < 50) mult = 50; |
537 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
537 | + if (is_original_ap_and_seen(m_ptr)) | |
538 | 538 | { |
539 | 539 | r_ptr->r_flags3 |= RF3_HURT_FIRE; |
540 | 540 | } |
@@ -549,7 +549,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
549 | 549 | /* Notice immunity */ |
550 | 550 | if (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK) |
551 | 551 | { |
552 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
552 | + if (is_original_ap_and_seen(m_ptr)) | |
553 | 553 | { |
554 | 554 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK); |
555 | 555 | } |
@@ -560,7 +560,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
560 | 560 | if (r_ptr->flags3 & RF3_HURT_COLD) |
561 | 561 | { |
562 | 562 | if (mult < 70) mult = 70; |
563 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
563 | + if (is_original_ap_and_seen(m_ptr)) | |
564 | 564 | { |
565 | 565 | r_ptr->r_flags3 |= RF3_HURT_COLD; |
566 | 566 | } |
@@ -572,7 +572,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
572 | 572 | if (r_ptr->flags3 & RF3_HURT_COLD) |
573 | 573 | { |
574 | 574 | if (mult < 50) mult = 50; |
575 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
575 | + if (is_original_ap_and_seen(m_ptr)) | |
576 | 576 | { |
577 | 577 | r_ptr->r_flags3 |= RF3_HURT_COLD; |
578 | 578 | } |
@@ -587,7 +587,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
587 | 587 | /* Notice immunity */ |
588 | 588 | if (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK) |
589 | 589 | { |
590 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
590 | + if (is_original_ap_and_seen(m_ptr)) | |
591 | 591 | { |
592 | 592 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK); |
593 | 593 | } |
@@ -612,7 +612,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
612 | 612 | { |
613 | 613 | if (r_ptr->flags3 & RF3_UNDEAD) |
614 | 614 | { |
615 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
615 | + if (is_original_ap_and_seen(m_ptr)) | |
616 | 616 | { |
617 | 617 | r_ptr->r_flags3 |= RF3_UNDEAD; |
618 | 618 | } |
@@ -629,7 +629,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bo | ||
629 | 629 | } |
630 | 630 | if ((mode == HISSATSU_HAGAN) && (r_ptr->flags3 & RF3_HURT_ROCK)) |
631 | 631 | { |
632 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
632 | + if (is_original_ap_and_seen(m_ptr)) | |
633 | 633 | { |
634 | 634 | r_ptr->r_flags3 |= RF3_HURT_ROCK; |
635 | 635 | } |
@@ -1726,13 +1726,12 @@ static void touch_zap_player(monster_type *m_ptr) | ||
1726 | 1726 | msg_print("You are suddenly very hot!"); |
1727 | 1727 | #endif |
1728 | 1728 | |
1729 | - | |
1730 | 1729 | if (prace_is_(RACE_ENT)) aura_damage += aura_damage / 3; |
1731 | 1730 | if (IS_OPPOSE_FIRE()) aura_damage = (aura_damage + 2) / 3; |
1732 | 1731 | if (p_ptr->resist_fire) aura_damage = (aura_damage + 2) / 3; |
1733 | 1732 | |
1734 | 1733 | take_hit(DAMAGE_NOESCAPE, aura_damage, aura_dam, -1); |
1735 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags2 |= RF2_AURA_FIRE; | |
1734 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= RF2_AURA_FIRE; | |
1736 | 1735 | handle_stuff(); |
1737 | 1736 | } |
1738 | 1737 | } |
@@ -1754,12 +1753,11 @@ static void touch_zap_player(monster_type *m_ptr) | ||
1754 | 1753 | msg_print("You are suddenly very cold!"); |
1755 | 1754 | #endif |
1756 | 1755 | |
1757 | - | |
1758 | 1756 | if (IS_OPPOSE_COLD()) aura_damage = (aura_damage + 2) / 3; |
1759 | 1757 | if (p_ptr->resist_cold) aura_damage = (aura_damage + 2) / 3; |
1760 | 1758 | |
1761 | 1759 | take_hit(DAMAGE_NOESCAPE, aura_damage, aura_dam, -1); |
1762 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags3 |= RF3_AURA_COLD; | |
1760 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_AURA_COLD; | |
1763 | 1761 | handle_stuff(); |
1764 | 1762 | } |
1765 | 1763 | } |
@@ -1786,7 +1784,7 @@ static void touch_zap_player(monster_type *m_ptr) | ||
1786 | 1784 | #endif |
1787 | 1785 | |
1788 | 1786 | take_hit(DAMAGE_NOESCAPE, aura_damage, aura_dam, -1); |
1789 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags2 |= RF2_AURA_ELEC; | |
1787 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= RF2_AURA_ELEC; | |
1790 | 1788 | handle_stuff(); |
1791 | 1789 | } |
1792 | 1790 | } |
@@ -2748,10 +2746,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int | ||
2748 | 2746 | /* Confuse the monster */ |
2749 | 2747 | if (r_ptr->flags3 & RF3_NO_CONF) |
2750 | 2748 | { |
2751 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
2752 | - { | |
2753 | - r_ptr->r_flags3 |= RF3_NO_CONF; | |
2754 | - } | |
2749 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_NO_CONF; | |
2755 | 2750 | |
2756 | 2751 | #ifdef JP |
2757 | 2752 | msg_format("%^sには効果がなかった。", m_name); |
@@ -2789,7 +2784,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int | ||
2789 | 2784 | { |
2790 | 2785 | if (r_ptr->flags1 & RF1_UNIQUE) |
2791 | 2786 | { |
2792 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2787 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2793 | 2788 | #ifdef JP |
2794 | 2789 | msg_format("%^sには効果がなかった。", m_name); |
2795 | 2790 | #else |
@@ -2800,7 +2795,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int | ||
2800 | 2795 | } |
2801 | 2796 | else if (r_ptr->level > randint1(100)) |
2802 | 2797 | { |
2803 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2798 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2804 | 2799 | #ifdef JP |
2805 | 2800 | msg_format("%^sは抵抗力を持っている!", m_name); |
2806 | 2801 | #else |
@@ -2986,7 +2986,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
2986 | 2986 | if ((have_flag(flgs, TR_SLAY_ANIMAL)) && |
2987 | 2987 | (r_ptr->flags3 & RF3_ANIMAL)) |
2988 | 2988 | { |
2989 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
2989 | + if (is_original_ap_and_seen(m_ptr)) | |
2990 | 2990 | { |
2991 | 2991 | r_ptr->r_flags3 |= RF3_ANIMAL; |
2992 | 2992 | } |
@@ -2998,7 +2998,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
2998 | 2998 | if ((have_flag(flgs, TR_KILL_ANIMAL)) && |
2999 | 2999 | (r_ptr->flags3 & RF3_ANIMAL)) |
3000 | 3000 | { |
3001 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3001 | + if (is_original_ap_and_seen(m_ptr)) | |
3002 | 3002 | { |
3003 | 3003 | r_ptr->r_flags3 |= RF3_ANIMAL; |
3004 | 3004 | } |
@@ -3010,7 +3010,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3010 | 3010 | if ((have_flag(flgs, TR_SLAY_EVIL)) && |
3011 | 3011 | (r_ptr->flags3 & RF3_EVIL)) |
3012 | 3012 | { |
3013 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3013 | + if (is_original_ap_and_seen(m_ptr)) | |
3014 | 3014 | { |
3015 | 3015 | r_ptr->r_flags3 |= RF3_EVIL; |
3016 | 3016 | } |
@@ -3022,7 +3022,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3022 | 3022 | if ((have_flag(flgs, TR_KILL_EVIL)) && |
3023 | 3023 | (r_ptr->flags3 & RF3_EVIL)) |
3024 | 3024 | { |
3025 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3025 | + if (is_original_ap_and_seen(m_ptr)) | |
3026 | 3026 | { |
3027 | 3027 | r_ptr->r_flags3 |= RF3_EVIL; |
3028 | 3028 | } |
@@ -3034,7 +3034,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3034 | 3034 | if ((have_flag(flgs, TR_SLAY_HUMAN)) && |
3035 | 3035 | (r_ptr->flags2 & RF2_HUMAN)) |
3036 | 3036 | { |
3037 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3037 | + if (is_original_ap_and_seen(m_ptr)) | |
3038 | 3038 | { |
3039 | 3039 | r_ptr->r_flags2 |= RF2_HUMAN; |
3040 | 3040 | } |
@@ -3046,7 +3046,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3046 | 3046 | if ((have_flag(flgs, TR_KILL_HUMAN)) && |
3047 | 3047 | (r_ptr->flags2 & RF2_HUMAN)) |
3048 | 3048 | { |
3049 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3049 | + if (is_original_ap_and_seen(m_ptr)) | |
3050 | 3050 | { |
3051 | 3051 | r_ptr->r_flags2 |= RF2_HUMAN; |
3052 | 3052 | } |
@@ -3058,7 +3058,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3058 | 3058 | if ((have_flag(flgs, TR_SLAY_UNDEAD)) && |
3059 | 3059 | (r_ptr->flags3 & RF3_UNDEAD)) |
3060 | 3060 | { |
3061 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3061 | + if (is_original_ap_and_seen(m_ptr)) | |
3062 | 3062 | { |
3063 | 3063 | r_ptr->r_flags3 |= RF3_UNDEAD; |
3064 | 3064 | } |
@@ -3070,7 +3070,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3070 | 3070 | if ((have_flag(flgs, TR_KILL_UNDEAD)) && |
3071 | 3071 | (r_ptr->flags3 & RF3_UNDEAD)) |
3072 | 3072 | { |
3073 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3073 | + if (is_original_ap_and_seen(m_ptr)) | |
3074 | 3074 | { |
3075 | 3075 | r_ptr->r_flags3 |= RF3_UNDEAD; |
3076 | 3076 | } |
@@ -3082,7 +3082,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3082 | 3082 | if ((have_flag(flgs, TR_SLAY_DEMON)) && |
3083 | 3083 | (r_ptr->flags3 & RF3_DEMON)) |
3084 | 3084 | { |
3085 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3085 | + if (is_original_ap_and_seen(m_ptr)) | |
3086 | 3086 | { |
3087 | 3087 | r_ptr->r_flags3 |= RF3_DEMON; |
3088 | 3088 | } |
@@ -3094,7 +3094,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3094 | 3094 | if ((have_flag(flgs, TR_KILL_DEMON)) && |
3095 | 3095 | (r_ptr->flags3 & RF3_DEMON)) |
3096 | 3096 | { |
3097 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3097 | + if (is_original_ap_and_seen(m_ptr)) | |
3098 | 3098 | { |
3099 | 3099 | r_ptr->r_flags3 |= RF3_DEMON; |
3100 | 3100 | } |
@@ -3106,7 +3106,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3106 | 3106 | if ((have_flag(flgs, TR_SLAY_ORC)) && |
3107 | 3107 | (r_ptr->flags3 & RF3_ORC)) |
3108 | 3108 | { |
3109 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3109 | + if (is_original_ap_and_seen(m_ptr)) | |
3110 | 3110 | { |
3111 | 3111 | r_ptr->r_flags3 |= RF3_ORC; |
3112 | 3112 | } |
@@ -3118,7 +3118,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3118 | 3118 | if ((have_flag(flgs, TR_KILL_ORC)) && |
3119 | 3119 | (r_ptr->flags3 & RF3_ORC)) |
3120 | 3120 | { |
3121 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3121 | + if (is_original_ap_and_seen(m_ptr)) | |
3122 | 3122 | { |
3123 | 3123 | r_ptr->r_flags3 |= RF3_ORC; |
3124 | 3124 | } |
@@ -3130,7 +3130,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3130 | 3130 | if ((have_flag(flgs, TR_SLAY_TROLL)) && |
3131 | 3131 | (r_ptr->flags3 & RF3_TROLL)) |
3132 | 3132 | { |
3133 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3133 | + if (is_original_ap_and_seen(m_ptr)) | |
3134 | 3134 | { |
3135 | 3135 | r_ptr->r_flags3 |= RF3_TROLL; |
3136 | 3136 | } |
@@ -3142,7 +3142,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3142 | 3142 | if ((have_flag(flgs, TR_KILL_TROLL)) && |
3143 | 3143 | (r_ptr->flags3 & RF3_TROLL)) |
3144 | 3144 | { |
3145 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3145 | + if (is_original_ap_and_seen(m_ptr)) | |
3146 | 3146 | { |
3147 | 3147 | r_ptr->r_flags3 |= RF3_TROLL; |
3148 | 3148 | } |
@@ -3154,7 +3154,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3154 | 3154 | if ((have_flag(flgs, TR_SLAY_GIANT)) && |
3155 | 3155 | (r_ptr->flags3 & RF3_GIANT)) |
3156 | 3156 | { |
3157 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3157 | + if (is_original_ap_and_seen(m_ptr)) | |
3158 | 3158 | { |
3159 | 3159 | r_ptr->r_flags3 |= RF3_GIANT; |
3160 | 3160 | } |
@@ -3166,7 +3166,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3166 | 3166 | if ((have_flag(flgs, TR_KILL_GIANT)) && |
3167 | 3167 | (r_ptr->flags3 & RF3_GIANT)) |
3168 | 3168 | { |
3169 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3169 | + if (is_original_ap_and_seen(m_ptr)) | |
3170 | 3170 | { |
3171 | 3171 | r_ptr->r_flags3 |= RF3_GIANT; |
3172 | 3172 | } |
@@ -3178,7 +3178,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3178 | 3178 | if ((have_flag(flgs, TR_SLAY_DRAGON)) && |
3179 | 3179 | (r_ptr->flags3 & RF3_DRAGON)) |
3180 | 3180 | { |
3181 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3181 | + if (is_original_ap_and_seen(m_ptr)) | |
3182 | 3182 | { |
3183 | 3183 | r_ptr->r_flags3 |= RF3_DRAGON; |
3184 | 3184 | } |
@@ -3190,7 +3190,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3190 | 3190 | if ((have_flag(flgs, TR_KILL_DRAGON)) && |
3191 | 3191 | (r_ptr->flags3 & RF3_DRAGON)) |
3192 | 3192 | { |
3193 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3193 | + if (is_original_ap_and_seen(m_ptr)) | |
3194 | 3194 | { |
3195 | 3195 | r_ptr->r_flags3 |= RF3_DRAGON; |
3196 | 3196 | } |
@@ -3209,7 +3209,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3209 | 3209 | /* Notice immunity */ |
3210 | 3210 | if (r_ptr->flagsr & RFR_EFF_IM_ACID_MASK) |
3211 | 3211 | { |
3212 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3212 | + if (is_original_ap_and_seen(m_ptr)) | |
3213 | 3213 | { |
3214 | 3214 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ACID_MASK); |
3215 | 3215 | } |
@@ -3228,7 +3228,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3228 | 3228 | /* Notice immunity */ |
3229 | 3229 | if (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK) |
3230 | 3230 | { |
3231 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3231 | + if (is_original_ap_and_seen(m_ptr)) | |
3232 | 3232 | { |
3233 | 3233 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK); |
3234 | 3234 | } |
@@ -3247,7 +3247,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3247 | 3247 | /* Notice immunity */ |
3248 | 3248 | if (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK) |
3249 | 3249 | { |
3250 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3250 | + if (is_original_ap_and_seen(m_ptr)) | |
3251 | 3251 | { |
3252 | 3252 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK); |
3253 | 3253 | } |
@@ -3259,7 +3259,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3259 | 3259 | if (r_ptr->flags3 & RF3_HURT_FIRE) |
3260 | 3260 | { |
3261 | 3261 | if (mult < 25) mult = 25; |
3262 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3262 | + if (is_original_ap_and_seen(m_ptr)) | |
3263 | 3263 | { |
3264 | 3264 | r_ptr->r_flags3 |= RF3_HURT_FIRE; |
3265 | 3265 | } |
@@ -3274,7 +3274,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3274 | 3274 | /* Notice immunity */ |
3275 | 3275 | if (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK) |
3276 | 3276 | { |
3277 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3277 | + if (is_original_ap_and_seen(m_ptr)) | |
3278 | 3278 | { |
3279 | 3279 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK); |
3280 | 3280 | } |
@@ -3285,7 +3285,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3285 | 3285 | if (r_ptr->flags3 & RF3_HURT_COLD) |
3286 | 3286 | { |
3287 | 3287 | if (mult < 25) mult = 25; |
3288 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3288 | + if (is_original_ap_and_seen(m_ptr)) | |
3289 | 3289 | { |
3290 | 3290 | r_ptr->r_flags3 |= RF3_HURT_COLD; |
3291 | 3291 | } |
@@ -3300,7 +3300,7 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) | ||
3300 | 3300 | /* Notice immunity */ |
3301 | 3301 | if (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK) |
3302 | 3302 | { |
3303 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3303 | + if (is_original_ap_and_seen(m_ptr)) | |
3304 | 3304 | { |
3305 | 3305 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_POIS_MASK); |
3306 | 3306 | } |
@@ -4076,6 +4076,9 @@ | ||
4076 | 4076 | #define is_original_ap(A) \ |
4077 | 4077 | (bool)(((A)->ap_r_idx == (A)->r_idx) ? TRUE : FALSE) |
4078 | 4078 | |
4079 | +#define is_original_ap_and_seen(A) \ | |
4080 | + (bool)((A)->ml && ((A)->ap_r_idx == (A)->r_idx)) | |
4081 | + | |
4079 | 4082 | /* |
4080 | 4083 | * Is the monster seen by the player? |
4081 | 4084 | */ |
@@ -971,7 +971,7 @@ msg_print("無 | ||
971 | 971 | { |
972 | 972 | if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) |
973 | 973 | { |
974 | - if (is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
974 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
975 | 975 | #ifdef JP |
976 | 976 | msg_format("%sには効果がなかった!", m_name); |
977 | 977 | #else |
@@ -982,7 +982,7 @@ msg_print("無 | ||
982 | 982 | } |
983 | 983 | else if (r_ptr->level > randint1(100)) |
984 | 984 | { |
985 | - if (is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
985 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
986 | 986 | #ifdef JP |
987 | 987 | msg_format("%sには耐性がある!", m_name); |
988 | 988 | #else |
@@ -268,10 +268,7 @@ bool make_attack_normal(int m_idx) | ||
268 | 268 | ((randint0(100) + p_ptr->lev) > 50)) |
269 | 269 | { |
270 | 270 | /* Remember the Evil-ness */ |
271 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
272 | - { | |
273 | - r_ptr->r_flags3 |= RF3_EVIL; | |
274 | - } | |
271 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL; | |
275 | 272 | |
276 | 273 | /* Message */ |
277 | 274 | #ifdef JP |
@@ -1874,7 +1871,7 @@ msg_format("%s | ||
1874 | 1871 | } |
1875 | 1872 | else |
1876 | 1873 | { |
1877 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
1874 | + if (is_original_ap_and_seen(m_ptr)) | |
1878 | 1875 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK); |
1879 | 1876 | } |
1880 | 1877 | } |
@@ -1906,7 +1903,7 @@ msg_format("%s | ||
1906 | 1903 | } |
1907 | 1904 | else |
1908 | 1905 | { |
1909 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
1906 | + if (is_original_ap_and_seen(m_ptr)) | |
1910 | 1907 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK); |
1911 | 1908 | } |
1912 | 1909 | } |
@@ -1938,7 +1935,7 @@ msg_format("%s | ||
1938 | 1935 | } |
1939 | 1936 | else |
1940 | 1937 | { |
1941 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
1938 | + if (is_original_ap_and_seen(m_ptr)) | |
1942 | 1939 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK); |
1943 | 1940 | } |
1944 | 1941 | } |
@@ -1970,7 +1967,7 @@ msg_format("%s | ||
1970 | 1967 | } |
1971 | 1968 | else |
1972 | 1969 | { |
1973 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
1970 | + if (is_original_ap_and_seen(m_ptr)) | |
1974 | 1971 | r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_RES_SHAR_MASK); |
1975 | 1972 | } |
1976 | 1973 |
@@ -2005,12 +2002,12 @@ msg_format("%s | ||
2005 | 2002 | blinked = FALSE; |
2006 | 2003 | alive = FALSE; |
2007 | 2004 | } |
2008 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
2005 | + if (is_original_ap_and_seen(m_ptr)) | |
2009 | 2006 | r_ptr->r_flags3 |= RF3_EVIL; |
2010 | 2007 | } |
2011 | 2008 | else |
2012 | 2009 | { |
2013 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
2010 | + if (is_original_ap_and_seen(m_ptr)) | |
2014 | 2011 | r_ptr->r_flagsr |= RFR_RES_ALL; |
2015 | 2012 | } |
2016 | 2013 | } |
@@ -2043,7 +2040,7 @@ msg_format("%s | ||
2043 | 2040 | } |
2044 | 2041 | else |
2045 | 2042 | { |
2046 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
2043 | + if (is_original_ap_and_seen(m_ptr)) | |
2047 | 2044 | r_ptr->r_flagsr |= RFR_RES_ALL; |
2048 | 2045 | } |
2049 | 2046 | } |
@@ -2048,7 +2048,7 @@ msg_format("%s | ||
2048 | 2048 | msg_format("%^s is suddenly very hot!", m_name); |
2049 | 2049 | #endif |
2050 | 2050 | } |
2051 | - if (m_ptr->ml && t_ptr->ml && is_original_ap(t_ptr)) tr_ptr->r_flags2 |= RF2_AURA_FIRE; | |
2051 | + if (m_ptr->ml && is_original_ap_and_seen(t_ptr)) tr_ptr->r_flags2 |= RF2_AURA_FIRE; | |
2052 | 2052 | project(t_idx, 0, m_ptr->fy, m_ptr->fx, |
2053 | 2053 | damroll (1 + ((tr_ptr->level) / 26), |
2054 | 2054 | 1 + ((tr_ptr->level) / 17)), |
@@ -2056,7 +2056,7 @@ msg_format("%s | ||
2056 | 2056 | } |
2057 | 2057 | else |
2058 | 2058 | { |
2059 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK); | |
2059 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK); | |
2060 | 2060 | } |
2061 | 2061 | } |
2062 | 2062 |
@@ -2073,7 +2073,7 @@ msg_format("%s | ||
2073 | 2073 | msg_format("%^s is suddenly very cold!", m_name); |
2074 | 2074 | #endif |
2075 | 2075 | } |
2076 | - if (m_ptr->ml && t_ptr->ml && is_original_ap(t_ptr)) tr_ptr->r_flags3 |= RF3_AURA_COLD; | |
2076 | + if (m_ptr->ml && is_original_ap_and_seen(t_ptr)) tr_ptr->r_flags3 |= RF3_AURA_COLD; | |
2077 | 2077 | project(t_idx, 0, m_ptr->fy, m_ptr->fx, |
2078 | 2078 | damroll (1 + ((tr_ptr->level) / 26), |
2079 | 2079 | 1 + ((tr_ptr->level) / 17)), |
@@ -2081,7 +2081,7 @@ msg_format("%s | ||
2081 | 2081 | } |
2082 | 2082 | else |
2083 | 2083 | { |
2084 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK); | |
2084 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_COLD_MASK); | |
2085 | 2085 | } |
2086 | 2086 | } |
2087 | 2087 |
@@ -2098,7 +2098,7 @@ msg_format("%s | ||
2098 | 2098 | msg_format("%^s gets zapped!", m_name); |
2099 | 2099 | #endif |
2100 | 2100 | } |
2101 | - if (m_ptr->ml && t_ptr->ml && is_original_ap(t_ptr)) tr_ptr->r_flags2 |= RF2_AURA_ELEC; | |
2101 | + if (m_ptr->ml && is_original_ap_and_seen(t_ptr)) tr_ptr->r_flags2 |= RF2_AURA_ELEC; | |
2102 | 2102 | project(t_idx, 0, m_ptr->fy, m_ptr->fx, |
2103 | 2103 | damroll (1 + ((tr_ptr->level) / 26), |
2104 | 2104 | 1 + ((tr_ptr->level) / 17)), |
@@ -2106,7 +2106,7 @@ msg_format("%s | ||
2106 | 2106 | } |
2107 | 2107 | else |
2108 | 2108 | { |
2109 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK); | |
2109 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK); | |
2110 | 2110 | } |
2111 | 2111 | } |
2112 | 2112 | } |
@@ -2573,7 +2573,7 @@ msg_format("%^s | ||
2573 | 2573 | if (multiply_monster(m_idx, FALSE, (is_pet(m_ptr) ? PM_FORCE_PET : 0))) |
2574 | 2574 | { |
2575 | 2575 | /* Take note if visible */ |
2576 | - if (m_ptr->ml && m_list[hack_m_idx_ii].ml && is_original_ap(m_ptr)) | |
2576 | + if (m_list[hack_m_idx_ii].ml && is_original_ap_and_seen(m_ptr)) | |
2577 | 2577 | { |
2578 | 2578 | r_ptr->r_flags2 |= (RF2_MULTIPLY); |
2579 | 2579 | } |
@@ -2606,7 +2606,7 @@ msg_format("%^s | ||
2606 | 2606 | } |
2607 | 2607 | } |
2608 | 2608 | |
2609 | - if (count && m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags6 |= (RF6_SPECIAL); | |
2609 | + if (count && is_original_ap_and_seen(m_ptr)) r_ptr->r_flags6 |= (RF6_SPECIAL); | |
2610 | 2610 | } |
2611 | 2611 | } |
2612 | 2612 | } |
@@ -2750,7 +2750,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
2750 | 2750 | (randint0(100) < 75)) |
2751 | 2751 | { |
2752 | 2752 | /* Memorize flags */ |
2753 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags1 |= (RF1_RAND_50 | RF1_RAND_25); | |
2753 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags1 |= (RF1_RAND_50 | RF1_RAND_25); | |
2754 | 2754 | |
2755 | 2755 | /* Try four "random" directions */ |
2756 | 2756 | mm[0] = mm[1] = mm[2] = mm[3] = 5; |
@@ -2761,7 +2761,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
2761 | 2761 | (randint0(100) < 50)) |
2762 | 2762 | { |
2763 | 2763 | /* Memorize flags */ |
2764 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags1 |= (RF1_RAND_50); | |
2764 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags1 |= (RF1_RAND_50); | |
2765 | 2765 | |
2766 | 2766 | /* Try four "random" directions */ |
2767 | 2767 | mm[0] = mm[1] = mm[2] = mm[3] = 5; |
@@ -2772,7 +2772,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
2772 | 2772 | (randint0(100) < 25)) |
2773 | 2773 | { |
2774 | 2774 | /* Memorize flags */ |
2775 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags1 |= RF1_RAND_25; | |
2775 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags1 |= RF1_RAND_25; | |
2776 | 2776 | |
2777 | 2777 | /* Try four "random" directions */ |
2778 | 2778 | mm[0] = mm[1] = mm[2] = mm[3] = 5; |
@@ -3110,7 +3110,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
3110 | 3110 | if (r_ptr->flags1 & RF1_NEVER_BLOW) |
3111 | 3111 | { |
3112 | 3112 | /* Hack -- memorize lack of attacks */ |
3113 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags1 |= (RF1_NEVER_BLOW); | |
3113 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags1 |= (RF1_NEVER_BLOW); | |
3114 | 3114 | |
3115 | 3115 | /* Do not move */ |
3116 | 3116 | do_move = FALSE; |
@@ -3124,7 +3124,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
3124 | 3124 | if (!(r_ptr->flags2 & RF2_STUPID)) do_move = FALSE; |
3125 | 3125 | else |
3126 | 3126 | { |
3127 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_STUPID); | |
3127 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_STUPID); | |
3128 | 3128 | } |
3129 | 3129 | } |
3130 | 3130 | } |
@@ -3164,7 +3164,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
3164 | 3164 | { |
3165 | 3165 | if (r_ptr->flags2 & RF2_KILL_BODY) |
3166 | 3166 | { |
3167 | - if (is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_KILL_BODY); | |
3167 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_KILL_BODY); | |
3168 | 3168 | } |
3169 | 3169 | |
3170 | 3170 | /* attack */ |
@@ -3178,7 +3178,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
3178 | 3178 | if (m_ptr->confused) return; |
3179 | 3179 | else if (r_ptr->flags2 & RF2_STUPID) |
3180 | 3180 | { |
3181 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_STUPID); | |
3181 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_STUPID); | |
3182 | 3182 | return; |
3183 | 3183 | } |
3184 | 3184 | } |
@@ -3224,7 +3224,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
3224 | 3224 | if (do_move && (r_ptr->flags1 & RF1_NEVER_MOVE)) |
3225 | 3225 | { |
3226 | 3226 | /* Hack -- memorize lack of attacks */ |
3227 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flags1 |= (RF1_NEVER_MOVE); | |
3227 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags1 |= (RF1_NEVER_MOVE); | |
3228 | 3228 | |
3229 | 3229 | /* Do not move */ |
3230 | 3230 | do_move = FALSE; |
@@ -3505,7 +3505,7 @@ msg_format("%^s%s", m_name, monmessage); | ||
3505 | 3505 | } |
3506 | 3506 | |
3507 | 3507 | /* Learn things from observable monster */ |
3508 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
3508 | + if (is_original_ap_and_seen(m_ptr)) | |
3509 | 3509 | { |
3510 | 3510 | /* Monster opened a door */ |
3511 | 3511 | if (did_open_door) r_ptr->r_flags2 |= (RF2_OPEN_DOOR); |
@@ -4555,7 +4555,7 @@ msg_print("¿ | ||
4555 | 4555 | } |
4556 | 4556 | |
4557 | 4557 | /* Remember what the monster did to us */ |
4558 | - if (seen && is_original_ap(m_ptr)) | |
4558 | + if (is_original_ap_and_seen(m_ptr)) | |
4559 | 4559 | { |
4560 | 4560 | /* Inate spell */ |
4561 | 4561 | if (thrown_spell < 32 * 4) |
@@ -3285,7 +3285,7 @@ bool monst_spell_monst(int m_idx) | ||
3285 | 3285 | { |
3286 | 3286 | if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flagsr & RFR_RES_ALL)) |
3287 | 3287 | { |
3288 | - if (t_ptr->ml && is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3288 | + if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3289 | 3289 | if (see_t) |
3290 | 3290 | { |
3291 | 3291 | #ifdef JP |
@@ -3299,7 +3299,7 @@ bool monst_spell_monst(int m_idx) | ||
3299 | 3299 | } |
3300 | 3300 | else if (tr_ptr->level > randint1(100)) |
3301 | 3301 | { |
3302 | - if (t_ptr->ml && is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3302 | + if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3303 | 3303 | if (see_t) |
3304 | 3304 | { |
3305 | 3305 | #ifdef JP |
@@ -3345,7 +3345,7 @@ bool monst_spell_monst(int m_idx) | ||
3345 | 3345 | { |
3346 | 3346 | if ((tr_ptr->flags1 & RF1_UNIQUE) || (tr_ptr->flagsr & RFR_RES_ALL)) |
3347 | 3347 | { |
3348 | - if (t_ptr->ml && is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3348 | + if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3349 | 3349 | if (see_t) |
3350 | 3350 | { |
3351 | 3351 | #ifdef JP |
@@ -3359,7 +3359,7 @@ bool monst_spell_monst(int m_idx) | ||
3359 | 3359 | } |
3360 | 3360 | else if (tr_ptr->level > randint1(100)) |
3361 | 3361 | { |
3362 | - if (t_ptr->ml && is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3362 | + if (is_original_ap_and_seen(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; | |
3363 | 3363 | if (see_t) |
3364 | 3364 | { |
3365 | 3365 | #ifdef JP |
@@ -4204,7 +4204,7 @@ bool monst_spell_monst(int m_idx) | ||
4204 | 4204 | } |
4205 | 4205 | |
4206 | 4206 | /* Remember what the monster did, if we saw it */ |
4207 | - if (m_ptr->ml && is_original_ap(m_ptr)) | |
4207 | + if (is_original_ap_and_seen(m_ptr)) | |
4208 | 4208 | { |
4209 | 4209 | /* Inate spell */ |
4210 | 4210 | if (thrown_spell < 32*4) |
@@ -1398,7 +1398,7 @@ msg_print("無 | ||
1398 | 1398 | { |
1399 | 1399 | if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) |
1400 | 1400 | { |
1401 | - if (is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
1401 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
1402 | 1402 | #ifdef JP |
1403 | 1403 | msg_format("%sには効果がなかった!", m_name); |
1404 | 1404 | #else |
@@ -1409,7 +1409,7 @@ msg_print("無 | ||
1409 | 1409 | } |
1410 | 1410 | else if (r_ptr->level > randint1(100)) |
1411 | 1411 | { |
1412 | - if (is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
1412 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
1413 | 1413 | #ifdef JP |
1414 | 1414 | msg_format("%sには耐性がある!", m_name); |
1415 | 1415 | #else |
@@ -1767,7 +1767,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) | ||
1767 | 1767 | note = " is immune."; |
1768 | 1768 | #endif |
1769 | 1769 | dam = 0; |
1770 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1770 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1771 | 1771 | break; |
1772 | 1772 | } |
1773 | 1773 | break; |
@@ -1786,7 +1786,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ , int flg) | ||
1786 | 1786 | note = " is immune."; |
1787 | 1787 | #endif |
1788 | 1788 | dam = 0; |
1789 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1789 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1790 | 1790 | break; |
1791 | 1791 | } |
1792 | 1792 | if (r_ptr->flagsr & RFR_IM_ACID) |
@@ -1798,7 +1798,7 @@ note = " | ||
1798 | 1798 | #endif |
1799 | 1799 | |
1800 | 1800 | dam /= 9; |
1801 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID); | |
1801 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ACID); | |
1802 | 1802 | } |
1803 | 1803 | break; |
1804 | 1804 | } |
@@ -1816,7 +1816,7 @@ note = " | ||
1816 | 1816 | note = " is immune."; |
1817 | 1817 | #endif |
1818 | 1818 | dam = 0; |
1819 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1819 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1820 | 1820 | break; |
1821 | 1821 | } |
1822 | 1822 | if (r_ptr->flagsr & RFR_IM_ELEC) |
@@ -1828,7 +1828,7 @@ note = " | ||
1828 | 1828 | #endif |
1829 | 1829 | |
1830 | 1830 | dam /= 9; |
1831 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC); | |
1831 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_ELEC); | |
1832 | 1832 | } |
1833 | 1833 | break; |
1834 | 1834 | } |
@@ -1846,7 +1846,7 @@ note = " | ||
1846 | 1846 | note = " is immune."; |
1847 | 1847 | #endif |
1848 | 1848 | dam = 0; |
1849 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1849 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1850 | 1850 | break; |
1851 | 1851 | } |
1852 | 1852 | if (r_ptr->flagsr & RFR_IM_FIRE) |
@@ -1858,7 +1858,7 @@ note = " | ||
1858 | 1858 | #endif |
1859 | 1859 | |
1860 | 1860 | dam /= 9; |
1861 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_FIRE); | |
1861 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_FIRE); | |
1862 | 1862 | } |
1863 | 1863 | else if (r_ptr->flags3 & (RF3_HURT_FIRE)) |
1864 | 1864 | { |
@@ -1869,7 +1869,7 @@ note = " | ||
1869 | 1869 | #endif |
1870 | 1870 | |
1871 | 1871 | dam *= 2; |
1872 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE); | |
1872 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_FIRE); | |
1873 | 1873 | } |
1874 | 1874 | break; |
1875 | 1875 | } |
@@ -1887,7 +1887,7 @@ note = " | ||
1887 | 1887 | note = " is immune."; |
1888 | 1888 | #endif |
1889 | 1889 | dam = 0; |
1890 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1890 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1891 | 1891 | break; |
1892 | 1892 | } |
1893 | 1893 | if (r_ptr->flagsr & RFR_IM_COLD) |
@@ -1899,7 +1899,7 @@ note = " | ||
1899 | 1899 | #endif |
1900 | 1900 | |
1901 | 1901 | dam /= 9; |
1902 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); | |
1902 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); | |
1903 | 1903 | } |
1904 | 1904 | else if (r_ptr->flags3 & (RF3_HURT_COLD)) |
1905 | 1905 | { |
@@ -1910,7 +1910,7 @@ note = " | ||
1910 | 1910 | #endif |
1911 | 1911 | |
1912 | 1912 | dam *= 2; |
1913 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); | |
1913 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); | |
1914 | 1914 | } |
1915 | 1915 | break; |
1916 | 1916 | } |
@@ -1928,7 +1928,7 @@ note = " | ||
1928 | 1928 | note = " is immune."; |
1929 | 1929 | #endif |
1930 | 1930 | dam = 0; |
1931 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1931 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1932 | 1932 | break; |
1933 | 1933 | } |
1934 | 1934 | if (r_ptr->flagsr & RFR_IM_POIS) |
@@ -1940,7 +1940,7 @@ note = " | ||
1940 | 1940 | #endif |
1941 | 1941 | |
1942 | 1942 | dam /= 9; |
1943 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); | |
1943 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); | |
1944 | 1944 | } |
1945 | 1945 | break; |
1946 | 1946 | } |
@@ -1958,7 +1958,7 @@ note = " | ||
1958 | 1958 | note = " is immune."; |
1959 | 1959 | #endif |
1960 | 1960 | dam = 0; |
1961 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1961 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1962 | 1962 | break; |
1963 | 1963 | } |
1964 | 1964 | if (r_ptr->flagsr & RFR_IM_POIS) |
@@ -1970,7 +1970,7 @@ note = " | ||
1970 | 1970 | #endif |
1971 | 1971 | |
1972 | 1972 | dam *= 3; dam /= randint1(6) + 6; |
1973 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); | |
1973 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_POIS); | |
1974 | 1974 | } |
1975 | 1975 | else if (one_in_(3)) do_poly = TRUE; |
1976 | 1976 | break; |
@@ -1989,7 +1989,7 @@ note = " | ||
1989 | 1989 | note = " is immune."; |
1990 | 1990 | #endif |
1991 | 1991 | dam = 0; |
1992 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1992 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
1993 | 1993 | break; |
1994 | 1994 | } |
1995 | 1995 | if (r_ptr->flags3 & RF3_GOOD) |
@@ -2001,7 +2001,7 @@ note = " | ||
2001 | 2001 | note = " is hit hard."; |
2002 | 2002 | #endif |
2003 | 2003 | |
2004 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); | |
2004 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); | |
2005 | 2005 | } |
2006 | 2006 | break; |
2007 | 2007 | } |
@@ -2019,7 +2019,7 @@ note = " | ||
2019 | 2019 | note = " is immune."; |
2020 | 2020 | #endif |
2021 | 2021 | dam = 0; |
2022 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2022 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2023 | 2023 | break; |
2024 | 2024 | } |
2025 | 2025 | if (r_ptr->flags3 & RF3_GOOD) |
@@ -2031,7 +2031,7 @@ note = " | ||
2031 | 2031 | note = " is immune."; |
2032 | 2032 | #endif |
2033 | 2033 | |
2034 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= RF3_GOOD; | |
2034 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_GOOD; | |
2035 | 2035 | } |
2036 | 2036 | else if (r_ptr->flags3 & RF3_EVIL) |
2037 | 2037 | { |
@@ -2042,7 +2042,7 @@ note = " | ||
2042 | 2042 | note = " is hit hard."; |
2043 | 2043 | #endif |
2044 | 2044 | |
2045 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL; | |
2045 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL; | |
2046 | 2046 | } |
2047 | 2047 | else |
2048 | 2048 | { |
@@ -2070,7 +2070,7 @@ note = " | ||
2070 | 2070 | note = " is immune."; |
2071 | 2071 | #endif |
2072 | 2072 | dam = 0; |
2073 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2073 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2074 | 2074 | break; |
2075 | 2075 | } |
2076 | 2076 | break; |
@@ -2089,7 +2089,7 @@ note = " | ||
2089 | 2089 | note = " is immune."; |
2090 | 2090 | #endif |
2091 | 2091 | dam = 0; |
2092 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2092 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2093 | 2093 | break; |
2094 | 2094 | } |
2095 | 2095 | if (r_ptr->flagsr & RFR_RES_PLAS) |
@@ -2101,7 +2101,7 @@ note = " | ||
2101 | 2101 | #endif |
2102 | 2102 | |
2103 | 2103 | dam *= 3; dam /= randint1(6) + 6; |
2104 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS); | |
2104 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_PLAS); | |
2105 | 2105 | } |
2106 | 2106 | break; |
2107 | 2107 | } |
@@ -2119,7 +2119,7 @@ note = " | ||
2119 | 2119 | note = " is immune."; |
2120 | 2120 | #endif |
2121 | 2121 | dam = 0; |
2122 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2122 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2123 | 2123 | break; |
2124 | 2124 | } |
2125 | 2125 | if (r_ptr->flagsr & RFR_RES_NETH) |
@@ -2133,7 +2133,7 @@ note = " | ||
2133 | 2133 | #endif |
2134 | 2134 | |
2135 | 2135 | dam = 0; |
2136 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
2136 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
2137 | 2137 | } |
2138 | 2138 | else |
2139 | 2139 | { |
@@ -2145,7 +2145,7 @@ note = " | ||
2145 | 2145 | |
2146 | 2146 | dam *= 3; dam /= randint1(6) + 6; |
2147 | 2147 | } |
2148 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NETH); | |
2148 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NETH); | |
2149 | 2149 | } |
2150 | 2150 | else if (r_ptr->flags3 & RF3_EVIL) |
2151 | 2151 | { |
@@ -2156,7 +2156,7 @@ note = " | ||
2156 | 2156 | note = " resists somewhat."; |
2157 | 2157 | #endif |
2158 | 2158 | |
2159 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
2159 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
2160 | 2160 | } |
2161 | 2161 | break; |
2162 | 2162 | } |
@@ -2174,7 +2174,7 @@ note = " | ||
2174 | 2174 | note = " is immune."; |
2175 | 2175 | #endif |
2176 | 2176 | dam = 0; |
2177 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2177 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2178 | 2178 | break; |
2179 | 2179 | } |
2180 | 2180 | if (r_ptr->flagsr & RFR_RES_WATE) |
@@ -2199,7 +2199,7 @@ note = " | ||
2199 | 2199 | |
2200 | 2200 | dam *= 3; dam /= randint1(6) + 6; |
2201 | 2201 | } |
2202 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE); | |
2202 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WATE); | |
2203 | 2203 | } |
2204 | 2204 | break; |
2205 | 2205 | } |
@@ -2217,7 +2217,7 @@ note = " | ||
2217 | 2217 | note = " is immune."; |
2218 | 2218 | #endif |
2219 | 2219 | dam = 0; |
2220 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2220 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2221 | 2221 | break; |
2222 | 2222 | } |
2223 | 2223 | if (r_ptr->flagsr & RFR_RES_CHAO) |
@@ -2229,7 +2229,7 @@ note = " | ||
2229 | 2229 | #endif |
2230 | 2230 | |
2231 | 2231 | dam *= 3; dam /= randint1(6) + 6; |
2232 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_CHAO); | |
2232 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_CHAO); | |
2233 | 2233 | } |
2234 | 2234 | else if ((r_ptr->flags3 & RF3_DEMON) && one_in_(3)) |
2235 | 2235 | { |
@@ -2240,7 +2240,7 @@ note = " | ||
2240 | 2240 | #endif |
2241 | 2241 | |
2242 | 2242 | dam *= 3; dam /= randint1(6) + 6; |
2243 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); | |
2243 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); | |
2244 | 2244 | } |
2245 | 2245 | else |
2246 | 2246 | { |
@@ -2263,7 +2263,7 @@ note = " | ||
2263 | 2263 | note = " is immune."; |
2264 | 2264 | #endif |
2265 | 2265 | dam = 0; |
2266 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2266 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2267 | 2267 | break; |
2268 | 2268 | } |
2269 | 2269 | if (r_ptr->flagsr & RFR_RES_SHAR) |
@@ -2275,7 +2275,7 @@ note = " | ||
2275 | 2275 | #endif |
2276 | 2276 | |
2277 | 2277 | dam *= 3; dam /= randint1(6) + 6; |
2278 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); | |
2278 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); | |
2279 | 2279 | } |
2280 | 2280 | break; |
2281 | 2281 | } |
@@ -2293,7 +2293,7 @@ note = " | ||
2293 | 2293 | note = " is immune."; |
2294 | 2294 | #endif |
2295 | 2295 | dam = 0; |
2296 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2296 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2297 | 2297 | break; |
2298 | 2298 | } |
2299 | 2299 | if (r_ptr->flagsr & RFR_RES_SHAR) |
@@ -2305,7 +2305,7 @@ note = " | ||
2305 | 2305 | #endif |
2306 | 2306 | |
2307 | 2307 | dam /= 2; |
2308 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); | |
2308 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SHAR); | |
2309 | 2309 | } |
2310 | 2310 | break; |
2311 | 2311 | } |
@@ -2324,7 +2324,7 @@ note = " | ||
2324 | 2324 | note = " is immune."; |
2325 | 2325 | #endif |
2326 | 2326 | dam = 0; |
2327 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2327 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2328 | 2328 | break; |
2329 | 2329 | } |
2330 | 2330 | if (r_ptr->flagsr & RFR_RES_SOUN) |
@@ -2336,7 +2336,7 @@ note = " | ||
2336 | 2336 | #endif |
2337 | 2337 | |
2338 | 2338 | dam *= 2; dam /= randint1(6) + 6; |
2339 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN); | |
2339 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_SOUN); | |
2340 | 2340 | } |
2341 | 2341 | else do_stun = (10 + randint1(15) + r) / (r + 1); |
2342 | 2342 | break; |
@@ -2355,7 +2355,7 @@ note = " | ||
2355 | 2355 | note = " is immune."; |
2356 | 2356 | #endif |
2357 | 2357 | dam = 0; |
2358 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2358 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2359 | 2359 | break; |
2360 | 2360 | } |
2361 | 2361 | if (r_ptr->flags3 & RF3_NO_CONF) |
@@ -2367,7 +2367,7 @@ note = " | ||
2367 | 2367 | #endif |
2368 | 2368 | |
2369 | 2369 | dam *= 3; dam /= randint1(6) + 6; |
2370 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
2370 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
2371 | 2371 | } |
2372 | 2372 | else do_conf = (10 + randint1(15) + r) / (r + 1); |
2373 | 2373 | break; |
@@ -2386,7 +2386,7 @@ note = " | ||
2386 | 2386 | note = " is immune."; |
2387 | 2387 | #endif |
2388 | 2388 | dam = 0; |
2389 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2389 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2390 | 2390 | break; |
2391 | 2391 | } |
2392 | 2392 | if (r_ptr->flagsr & RFR_RES_DISE) |
@@ -2398,7 +2398,7 @@ note = " | ||
2398 | 2398 | #endif |
2399 | 2399 | |
2400 | 2400 | dam *= 3; dam /= randint1(6) + 6; |
2401 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE); | |
2401 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DISE); | |
2402 | 2402 | } |
2403 | 2403 | break; |
2404 | 2404 | } |
@@ -2416,7 +2416,7 @@ note = " | ||
2416 | 2416 | note = " is immune."; |
2417 | 2417 | #endif |
2418 | 2418 | dam = 0; |
2419 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2419 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2420 | 2420 | break; |
2421 | 2421 | } |
2422 | 2422 | if (r_ptr->flagsr & RFR_RES_NEXU) |
@@ -2428,7 +2428,7 @@ note = " | ||
2428 | 2428 | #endif |
2429 | 2429 | |
2430 | 2430 | dam *= 3; dam /= randint1(6) + 6; |
2431 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU); | |
2431 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_NEXU); | |
2432 | 2432 | } |
2433 | 2433 | break; |
2434 | 2434 | } |
@@ -2446,7 +2446,7 @@ note = " | ||
2446 | 2446 | note = " is immune."; |
2447 | 2447 | #endif |
2448 | 2448 | dam = 0; |
2449 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2449 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2450 | 2450 | break; |
2451 | 2451 | } |
2452 | 2452 | if (r_ptr->flagsr & RFR_RES_WALL) |
@@ -2458,7 +2458,7 @@ note = " | ||
2458 | 2458 | #endif |
2459 | 2459 | |
2460 | 2460 | dam *= 3; dam /= randint1(6) + 6; |
2461 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL); | |
2461 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_WALL); | |
2462 | 2462 | } |
2463 | 2463 | else do_stun = (randint1(15) + r) / (r + 1); |
2464 | 2464 | break; |
@@ -2477,7 +2477,7 @@ note = " | ||
2477 | 2477 | note = " is immune."; |
2478 | 2478 | #endif |
2479 | 2479 | dam = 0; |
2480 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2480 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2481 | 2481 | break; |
2482 | 2482 | } |
2483 | 2483 | if (r_ptr->flagsr & RFR_RES_INER) |
@@ -2489,7 +2489,7 @@ note = " | ||
2489 | 2489 | #endif |
2490 | 2490 | |
2491 | 2491 | dam *= 3; dam /= randint1(6) + 6; |
2492 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER); | |
2492 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_INER); | |
2493 | 2493 | } |
2494 | 2494 | else |
2495 | 2495 | { |
@@ -2531,7 +2531,7 @@ note = " | ||
2531 | 2531 | note = " is immune."; |
2532 | 2532 | #endif |
2533 | 2533 | dam = 0; |
2534 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2534 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2535 | 2535 | break; |
2536 | 2536 | } |
2537 | 2537 | if (r_ptr->flagsr & RFR_RES_TIME) |
@@ -2543,7 +2543,7 @@ note = " | ||
2543 | 2543 | #endif |
2544 | 2544 | |
2545 | 2545 | dam *= 3; dam /= randint1(6) + 6; |
2546 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME); | |
2546 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_TIME); | |
2547 | 2547 | } |
2548 | 2548 | else do_time = (dam + 1) / 2; |
2549 | 2549 | break; |
@@ -2564,14 +2564,14 @@ note = " | ||
2564 | 2564 | note = " is immune."; |
2565 | 2565 | #endif |
2566 | 2566 | dam = 0; |
2567 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2567 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2568 | 2568 | break; |
2569 | 2569 | } |
2570 | 2570 | if (r_ptr->flagsr & RFR_RES_TELE) |
2571 | 2571 | { |
2572 | 2572 | if (r_ptr->flags1 & (RF1_UNIQUE)) |
2573 | 2573 | { |
2574 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2574 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2575 | 2575 | #ifdef JP |
2576 | 2576 | note = "には効果がなかった。"; |
2577 | 2577 | #else |
@@ -2582,7 +2582,7 @@ note = " | ||
2582 | 2582 | } |
2583 | 2583 | else if (r_ptr->level > randint1(100)) |
2584 | 2584 | { |
2585 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2585 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
2586 | 2586 | #ifdef JP |
2587 | 2587 | note = "には耐性がある!"; |
2588 | 2588 | #else |
@@ -2607,7 +2607,7 @@ note = " | ||
2607 | 2607 | |
2608 | 2608 | dam *= 3; dam /= randint1(6) + 6; |
2609 | 2609 | do_dist = 0; |
2610 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV); | |
2610 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_GRAV); | |
2611 | 2611 | } |
2612 | 2612 | else |
2613 | 2613 | { |
@@ -2671,7 +2671,7 @@ note = " | ||
2671 | 2671 | note = " is immune."; |
2672 | 2672 | #endif |
2673 | 2673 | dam = 0; |
2674 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2674 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2675 | 2675 | break; |
2676 | 2676 | } |
2677 | 2677 | break; |
@@ -2691,12 +2691,12 @@ note = " | ||
2691 | 2691 | note = " is immune."; |
2692 | 2692 | #endif |
2693 | 2693 | dam = 0; |
2694 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2694 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2695 | 2695 | break; |
2696 | 2696 | } |
2697 | 2697 | if (r_ptr->flags3 & RF3_HURT_ROCK) |
2698 | 2698 | { |
2699 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); | |
2699 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); | |
2700 | 2700 | #ifdef JP |
2701 | 2701 | note = "の皮膚がただれた!"; |
2702 | 2702 | note_dies = "は蒸発した!"; |
@@ -2734,7 +2734,7 @@ note_dies = " | ||
2734 | 2734 | note = " is immune."; |
2735 | 2735 | #endif |
2736 | 2736 | dam = 0; |
2737 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2737 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2738 | 2738 | break; |
2739 | 2739 | } |
2740 | 2740 | if (r_ptr->flags2 & RF2_EMPTY_MIND) |
@@ -2745,7 +2745,7 @@ note_dies = " | ||
2745 | 2745 | #else |
2746 | 2746 | note = " is immune!"; |
2747 | 2747 | #endif |
2748 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
2748 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
2749 | 2749 | |
2750 | 2750 | } |
2751 | 2751 | else if ((r_ptr->flags2 & (RF2_STUPID | RF2_WEIRD_MIND)) || |
@@ -2871,7 +2871,7 @@ note_dies = " | ||
2871 | 2871 | note = " is immune."; |
2872 | 2872 | #endif |
2873 | 2873 | dam = 0; |
2874 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2874 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2875 | 2875 | break; |
2876 | 2876 | } |
2877 | 2877 | if (r_ptr->flags2 & RF2_EMPTY_MIND) |
@@ -2978,7 +2978,7 @@ note_dies = " | ||
2978 | 2978 | note = " is immune."; |
2979 | 2979 | #endif |
2980 | 2980 | dam = 0; |
2981 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2981 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
2982 | 2982 | break; |
2983 | 2983 | } |
2984 | 2984 | if (one_in_(4)) |
@@ -3015,7 +3015,7 @@ note_dies = " | ||
3015 | 3015 | note = " is immune."; |
3016 | 3016 | #endif |
3017 | 3017 | dam = 0; |
3018 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3018 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3019 | 3019 | break; |
3020 | 3020 | } |
3021 | 3021 | break; |
@@ -3034,7 +3034,7 @@ note_dies = " | ||
3034 | 3034 | note = " is immune."; |
3035 | 3035 | #endif |
3036 | 3036 | dam = 0; |
3037 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3037 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3038 | 3038 | break; |
3039 | 3039 | } |
3040 | 3040 | break; |
@@ -3054,7 +3054,7 @@ note_dies = " | ||
3054 | 3054 | note = " is immune."; |
3055 | 3055 | #endif |
3056 | 3056 | dam = 0; |
3057 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3057 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3058 | 3058 | break; |
3059 | 3059 | } |
3060 | 3060 | /* Attempt a saving throw */ |
@@ -3065,7 +3065,7 @@ note_dies = " | ||
3065 | 3065 | /* Memorize a flag */ |
3066 | 3066 | if (r_ptr->flags3 & RF3_NO_CONF) |
3067 | 3067 | { |
3068 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
3068 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
3069 | 3069 | } |
3070 | 3070 | |
3071 | 3071 | /* Resist */ |
@@ -3183,7 +3183,7 @@ note = " | ||
3183 | 3183 | note = " is immune."; |
3184 | 3184 | #endif |
3185 | 3185 | dam = 0; |
3186 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3186 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3187 | 3187 | break; |
3188 | 3188 | } |
3189 | 3189 | do_stun = (randint1(15) + 1) / (r + 1); |
@@ -3196,7 +3196,7 @@ note = " | ||
3196 | 3196 | #endif |
3197 | 3197 | |
3198 | 3198 | dam /= 9; |
3199 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); | |
3199 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_IM_COLD); | |
3200 | 3200 | } |
3201 | 3201 | else if (r_ptr->flags3 & (RF3_HURT_COLD)) |
3202 | 3202 | { |
@@ -3207,7 +3207,7 @@ note = " | ||
3207 | 3207 | #endif |
3208 | 3208 | |
3209 | 3209 | dam *= 2; |
3210 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); | |
3210 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_COLD); | |
3211 | 3211 | } |
3212 | 3212 | break; |
3213 | 3213 | } |
@@ -3226,23 +3226,20 @@ note = " | ||
3226 | 3226 | note = " is immune."; |
3227 | 3227 | #endif |
3228 | 3228 | dam = 0; |
3229 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3229 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3230 | 3230 | break; |
3231 | 3231 | } |
3232 | 3232 | if (!monster_living(r_ptr)) |
3233 | 3233 | { |
3234 | - if (seen) | |
3234 | + if (is_original_ap_and_seen(m_ptr)) | |
3235 | 3235 | { |
3236 | - if (is_original_ap(m_ptr)) | |
3237 | - { | |
3238 | - if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); | |
3239 | - if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
3240 | - if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); | |
3241 | - } | |
3236 | + if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); | |
3237 | + if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
3238 | + if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); | |
3242 | 3239 | } |
3243 | 3240 | |
3244 | 3241 | #ifdef JP |
3245 | -note = "には効果がなかった!"; | |
3242 | + note = "には効果がなかった!"; | |
3246 | 3243 | #else |
3247 | 3244 | note = " is unaffected!"; |
3248 | 3245 | #endif |
@@ -3268,23 +3265,20 @@ note = " | ||
3268 | 3265 | note = " is immune."; |
3269 | 3266 | #endif |
3270 | 3267 | dam = 0; |
3271 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3268 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3272 | 3269 | break; |
3273 | 3270 | } |
3274 | 3271 | if (!monster_living(r_ptr)) |
3275 | 3272 | { |
3276 | - if (seen) | |
3273 | + if (is_original_ap_and_seen(m_ptr)) | |
3277 | 3274 | { |
3278 | - if (is_original_ap(m_ptr)) | |
3279 | - { | |
3280 | - if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); | |
3281 | - if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
3282 | - if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); | |
3283 | - } | |
3275 | + if (r_ptr->flags3 & RF3_DEMON) r_ptr->r_flags3 |= (RF3_DEMON); | |
3276 | + if (r_ptr->flags3 & RF3_UNDEAD) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
3277 | + if (r_ptr->flags3 & RF3_NONLIVING) r_ptr->r_flags3 |= (RF3_NONLIVING); | |
3284 | 3278 | } |
3285 | 3279 | |
3286 | 3280 | #ifdef JP |
3287 | -note = "には完全な耐性がある。"; | |
3281 | + note = "には完全な耐性がある。"; | |
3288 | 3282 | #else |
3289 | 3283 | note = " is immune."; |
3290 | 3284 | #endif |
@@ -3323,7 +3317,7 @@ note = " | ||
3323 | 3317 | note = " is immune."; |
3324 | 3318 | #endif |
3325 | 3319 | dam = 0; |
3326 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3320 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3327 | 3321 | break; |
3328 | 3322 | } |
3329 | 3323 | /* Attempt to polymorph (see below) */ |
@@ -3537,7 +3531,7 @@ note = " | ||
3537 | 3531 | note = " is immune."; |
3538 | 3532 | #endif |
3539 | 3533 | dam = 0; |
3540 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3534 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3541 | 3535 | break; |
3542 | 3536 | } |
3543 | 3537 | /* Powerful monsters can resist */ |
@@ -3589,7 +3583,7 @@ note = " | ||
3589 | 3583 | note = " is immune."; |
3590 | 3584 | #endif |
3591 | 3585 | dam = 0; |
3592 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3586 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3593 | 3587 | break; |
3594 | 3588 | } |
3595 | 3589 | /* Attempt a saving throw */ |
@@ -3600,7 +3594,7 @@ note = " | ||
3600 | 3594 | /* Memorize a flag */ |
3601 | 3595 | if (r_ptr->flags3 & RF3_NO_SLEEP) |
3602 | 3596 | { |
3603 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); | |
3597 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); | |
3604 | 3598 | } |
3605 | 3599 | |
3606 | 3600 | /* No obvious effect */ |
@@ -3643,7 +3637,7 @@ note = " | ||
3643 | 3637 | note = " is immune."; |
3644 | 3638 | #endif |
3645 | 3639 | dam = 0; |
3646 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3640 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3647 | 3641 | break; |
3648 | 3642 | } |
3649 | 3643 | /* Attempt a saving throw */ |
@@ -3689,7 +3683,7 @@ note = " | ||
3689 | 3683 | note = " is immune."; |
3690 | 3684 | #endif |
3691 | 3685 | dam = 0; |
3692 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3686 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3693 | 3687 | break; |
3694 | 3688 | } |
3695 | 3689 | /* Attempt a saving throw */ |
@@ -3748,7 +3742,7 @@ note = " | ||
3748 | 3742 | note = " is immune."; |
3749 | 3743 | #endif |
3750 | 3744 | dam = 0; |
3751 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3745 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3752 | 3746 | break; |
3753 | 3747 | } |
3754 | 3748 |
@@ -3764,7 +3758,7 @@ note = " | ||
3764 | 3758 | /* Memorize a flag */ |
3765 | 3759 | if (r_ptr->flags3 & RF3_NO_CONF) |
3766 | 3760 | { |
3767 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
3761 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
3768 | 3762 | } |
3769 | 3763 | |
3770 | 3764 | /* Resist */ |
@@ -3835,7 +3829,7 @@ note = " | ||
3835 | 3829 | note = " is immune."; |
3836 | 3830 | #endif |
3837 | 3831 | dam = 0; |
3838 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3832 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3839 | 3833 | break; |
3840 | 3834 | } |
3841 | 3835 |
@@ -3910,7 +3904,7 @@ note = " | ||
3910 | 3904 | note = " is immune."; |
3911 | 3905 | #endif |
3912 | 3906 | dam = 0; |
3913 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3907 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3914 | 3908 | break; |
3915 | 3909 | } |
3916 | 3910 |
@@ -3986,7 +3980,7 @@ note = " | ||
3986 | 3980 | note = " is immune."; |
3987 | 3981 | #endif |
3988 | 3982 | dam = 0; |
3989 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3983 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
3990 | 3984 | break; |
3991 | 3985 | } |
3992 | 3986 |
@@ -4003,7 +3997,7 @@ note = " | ||
4003 | 3997 | /* Memorize a flag */ |
4004 | 3998 | if (r_ptr->flags3 & (RF3_NO_CONF)) |
4005 | 3999 | { |
4006 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
4000 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
4007 | 4001 | } |
4008 | 4002 | |
4009 | 4003 | /* Resist */ |
@@ -4082,7 +4076,7 @@ msg_format("%s | ||
4082 | 4076 | note = " is immune."; |
4083 | 4077 | #endif |
4084 | 4078 | dam = 0; |
4085 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4079 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4086 | 4080 | break; |
4087 | 4081 | } |
4088 | 4082 |
@@ -4148,7 +4142,7 @@ note = " | ||
4148 | 4142 | note = " is immune."; |
4149 | 4143 | #endif |
4150 | 4144 | dam = 0; |
4151 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4145 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4152 | 4146 | break; |
4153 | 4147 | } |
4154 | 4148 | /* Get confused later */ |
@@ -4162,7 +4156,7 @@ note = " | ||
4162 | 4156 | /* Memorize a flag */ |
4163 | 4157 | if (r_ptr->flags3 & (RF3_NO_CONF)) |
4164 | 4158 | { |
4165 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
4159 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
4166 | 4160 | } |
4167 | 4161 | |
4168 | 4162 | /* Resist */ |
@@ -4195,7 +4189,7 @@ note = " | ||
4195 | 4189 | note = " is immune."; |
4196 | 4190 | #endif |
4197 | 4191 | dam = 0; |
4198 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4192 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4199 | 4193 | break; |
4200 | 4194 | } |
4201 | 4195 | do_stun = damroll((caster_lev / 20) + 3 , (dam)) + 1; |
@@ -4241,14 +4235,11 @@ note = " | ||
4241 | 4235 | /* Hurt by light */ |
4242 | 4236 | if (r_ptr->flags3 & (RF3_HURT_LITE)) |
4243 | 4237 | { |
4244 | - if (seen) | |
4245 | - { | |
4246 | - /* Obvious effect */ | |
4247 | - obvious = TRUE; | |
4238 | + /* Obvious effect */ | |
4239 | + if (seen) obvious = TRUE; | |
4248 | 4240 | |
4249 | - /* Memorize the effects */ | |
4250 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); | |
4251 | - } | |
4241 | + /* Memorize the effects */ | |
4242 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); | |
4252 | 4243 | |
4253 | 4244 | /* Special effect */ |
4254 | 4245 | #ifdef JP |
@@ -4286,7 +4277,7 @@ note_dies = " | ||
4286 | 4277 | note = " is immune."; |
4287 | 4278 | #endif |
4288 | 4279 | dam = 0; |
4289 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4280 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4290 | 4281 | break; |
4291 | 4282 | } |
4292 | 4283 | if (r_ptr->flagsr & RFR_RES_LITE) |
@@ -4298,11 +4289,11 @@ note_dies = " | ||
4298 | 4289 | #endif |
4299 | 4290 | |
4300 | 4291 | dam *= 2; dam /= (randint1(6)+6); |
4301 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE); | |
4292 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_LITE); | |
4302 | 4293 | } |
4303 | 4294 | else if (r_ptr->flags3 & (RF3_HURT_LITE)) |
4304 | 4295 | { |
4305 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); | |
4296 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); | |
4306 | 4297 | #ifdef JP |
4307 | 4298 | note = "は光に身をすくめた!"; |
4308 | 4299 | note_dies = "は光を受けてしぼんでしまった!"; |
@@ -4330,7 +4321,7 @@ note_dies = " | ||
4330 | 4321 | note = " is immune."; |
4331 | 4322 | #endif |
4332 | 4323 | dam = 0; |
4333 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4324 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4334 | 4325 | break; |
4335 | 4326 | } |
4336 | 4327 | if (r_ptr->flagsr & RFR_RES_DARK) |
@@ -4342,7 +4333,7 @@ note_dies = " | ||
4342 | 4333 | #endif |
4343 | 4334 | |
4344 | 4335 | dam *= 2; dam /= (randint1(6)+6); |
4345 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK); | |
4336 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_DARK); | |
4346 | 4337 | } |
4347 | 4338 | break; |
4348 | 4339 | } |
@@ -4359,14 +4350,11 @@ note_dies = " | ||
4359 | 4350 | /* Hurt by rock remover */ |
4360 | 4351 | if (r_ptr->flags3 & (RF3_HURT_ROCK)) |
4361 | 4352 | { |
4362 | - if (seen) | |
4363 | - { | |
4364 | - /* Notice effect */ | |
4365 | - obvious = TRUE; | |
4353 | + /* Notice effect */ | |
4354 | + if (seen) obvious = TRUE; | |
4366 | 4355 | |
4367 | - /* Memorize the effects */ | |
4368 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); | |
4369 | - } | |
4356 | + /* Memorize the effects */ | |
4357 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_ROCK); | |
4370 | 4358 | |
4371 | 4359 | /* Cute little message */ |
4372 | 4360 | #ifdef JP |
@@ -4402,7 +4390,7 @@ note_dies = " | ||
4402 | 4390 | { |
4403 | 4391 | if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) |
4404 | 4392 | { |
4405 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4393 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4406 | 4394 | #ifdef JP |
4407 | 4395 | note = "には効果がなかった!"; |
4408 | 4396 | #else |
@@ -4413,7 +4401,7 @@ note = " | ||
4413 | 4401 | } |
4414 | 4402 | else if (r_ptr->level > randint1(100)) |
4415 | 4403 | { |
4416 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4404 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4417 | 4405 | #ifdef JP |
4418 | 4406 | note = "には耐性がある!"; |
4419 | 4407 | #else |
@@ -4426,11 +4414,8 @@ note = " | ||
4426 | 4414 | |
4427 | 4415 | if (!resists_tele) |
4428 | 4416 | { |
4429 | - if (seen) | |
4430 | - { | |
4431 | - obvious = TRUE; | |
4432 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
4433 | - } | |
4417 | + if (seen) obvious = TRUE; | |
4418 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
4434 | 4419 | do_dist = dam; |
4435 | 4420 | } |
4436 | 4421 | } |
@@ -4460,7 +4445,7 @@ note = " | ||
4460 | 4445 | { |
4461 | 4446 | if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) |
4462 | 4447 | { |
4463 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4448 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4464 | 4449 | #ifdef JP |
4465 | 4450 | note = "には効果がなかった!"; |
4466 | 4451 | #else |
@@ -4471,7 +4456,7 @@ note = " | ||
4471 | 4456 | } |
4472 | 4457 | else if (r_ptr->level > randint1(100)) |
4473 | 4458 | { |
4474 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4459 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4475 | 4460 | #ifdef JP |
4476 | 4461 | note = "には耐性がある!"; |
4477 | 4462 | #else |
@@ -4484,11 +4469,8 @@ note = " | ||
4484 | 4469 | |
4485 | 4470 | if (!resists_tele) |
4486 | 4471 | { |
4487 | - if (seen) | |
4488 | - { | |
4489 | - obvious = TRUE; | |
4490 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
4491 | - } | |
4472 | + if (seen) obvious = TRUE; | |
4473 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
4492 | 4474 | do_dist = dam; |
4493 | 4475 | } |
4494 | 4476 | } |
@@ -4514,9 +4496,9 @@ note = " | ||
4514 | 4496 | { |
4515 | 4497 | if ((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flagsr & RFR_RES_ALL)) |
4516 | 4498 | { |
4517 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4499 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4518 | 4500 | #ifdef JP |
4519 | -note = "には効果がなかった!"; | |
4501 | + note = "には効果がなかった!"; | |
4520 | 4502 | #else |
4521 | 4503 | note = " is unaffected!"; |
4522 | 4504 | #endif |
@@ -4525,9 +4507,9 @@ note = " | ||
4525 | 4507 | } |
4526 | 4508 | else if (r_ptr->level > randint1(100)) |
4527 | 4509 | { |
4528 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4510 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
4529 | 4511 | #ifdef JP |
4530 | -note = "には耐性がある!"; | |
4512 | + note = "には耐性がある!"; | |
4531 | 4513 | #else |
4532 | 4514 | note = " resists!"; |
4533 | 4515 | #endif |
@@ -4562,14 +4544,11 @@ note = " | ||
4562 | 4544 | /* Only affect undead */ |
4563 | 4545 | if (r_ptr->flags3 & (RF3_UNDEAD)) |
4564 | 4546 | { |
4565 | - if (seen) | |
4566 | - { | |
4567 | - /* Learn about type */ | |
4568 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
4547 | + /* Obvious */ | |
4548 | + if (seen) obvious = TRUE; | |
4569 | 4549 | |
4570 | - /* Obvious */ | |
4571 | - obvious = TRUE; | |
4572 | - } | |
4550 | + /* Learn about type */ | |
4551 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
4573 | 4552 | |
4574 | 4553 | /* Apply some fear */ |
4575 | 4554 | do_fear = damroll(3, (dam / 2)) + 1; |
@@ -4579,7 +4558,7 @@ note = " | ||
4579 | 4558 | { |
4580 | 4559 | /* No obvious effect */ |
4581 | 4560 | #ifdef JP |
4582 | -note = "には効果がなかった!"; | |
4561 | + note = "には効果がなかった!"; | |
4583 | 4562 | #else |
4584 | 4563 | note = " is unaffected!"; |
4585 | 4564 | #endif |
@@ -4613,14 +4592,11 @@ note = " | ||
4613 | 4592 | /* Only affect evil */ |
4614 | 4593 | if (r_ptr->flags3 & (RF3_EVIL)) |
4615 | 4594 | { |
4616 | - if (seen) | |
4617 | - { | |
4618 | - /* Learn about type */ | |
4619 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
4595 | + /* Obvious */ | |
4596 | + if (seen) obvious = TRUE; | |
4620 | 4597 | |
4621 | - /* Obvious */ | |
4622 | - obvious = TRUE; | |
4623 | - } | |
4598 | + /* Learn about type */ | |
4599 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
4624 | 4600 | |
4625 | 4601 | /* Apply some fear */ |
4626 | 4602 | do_fear = damroll(3, (dam / 2)) + 1; |
@@ -4630,7 +4606,7 @@ note = " | ||
4630 | 4606 | { |
4631 | 4607 | /* No obvious effect */ |
4632 | 4608 | #ifdef JP |
4633 | -note = "には効果がなかった!"; | |
4609 | + note = "には効果がなかった!"; | |
4634 | 4610 | #else |
4635 | 4611 | note = " is unaffected!"; |
4636 | 4612 | #endif |
@@ -4701,24 +4677,20 @@ note = " | ||
4701 | 4677 | /* Only affect undead */ |
4702 | 4678 | if (r_ptr->flags3 & (RF3_UNDEAD)) |
4703 | 4679 | { |
4704 | - if (seen) | |
4705 | - { | |
4706 | - /* Learn about type */ | |
4707 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
4680 | + /* Obvious */ | |
4681 | + if (seen) obvious = TRUE; | |
4708 | 4682 | |
4709 | - /* Obvious */ | |
4710 | - obvious = TRUE; | |
4711 | - } | |
4683 | + /* Learn about type */ | |
4684 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); | |
4712 | 4685 | |
4713 | 4686 | /* Message */ |
4714 | 4687 | #ifdef JP |
4715 | -note = "は身震いした。"; | |
4716 | -note_dies = "はドロドロに溶けた!"; | |
4688 | + note = "は身震いした。"; | |
4689 | + note_dies = "はドロドロに溶けた!"; | |
4717 | 4690 | #else |
4718 | 4691 | note = " shudders."; |
4719 | 4692 | note_dies = " dissolves!"; |
4720 | 4693 | #endif |
4721 | - | |
4722 | 4694 | } |
4723 | 4695 | |
4724 | 4696 | /* Others ignore */ |
@@ -4747,24 +4719,20 @@ note_dies = " | ||
4747 | 4719 | /* Only affect evil */ |
4748 | 4720 | if (r_ptr->flags3 & (RF3_EVIL)) |
4749 | 4721 | { |
4750 | - if (seen) | |
4751 | - { | |
4752 | - /* Learn about type */ | |
4753 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
4722 | + /* Obvious */ | |
4723 | + if (seen) obvious = TRUE; | |
4754 | 4724 | |
4755 | - /* Obvious */ | |
4756 | - obvious = TRUE; | |
4757 | - } | |
4725 | + /* Learn about type */ | |
4726 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); | |
4758 | 4727 | |
4759 | 4728 | /* Message */ |
4760 | 4729 | #ifdef JP |
4761 | -note = "は身震いした。"; | |
4762 | -note_dies = "はドロドロに溶けた!"; | |
4730 | + note = "は身震いした。"; | |
4731 | + note_dies = "はドロドロに溶けた!"; | |
4763 | 4732 | #else |
4764 | 4733 | note = " shudders."; |
4765 | 4734 | note_dies = " dissolves!"; |
4766 | 4735 | #endif |
4767 | - | |
4768 | 4736 | } |
4769 | 4737 | |
4770 | 4738 | /* Others ignore */ |
@@ -4792,24 +4760,20 @@ note_dies = " | ||
4792 | 4760 | /* Only affect good */ |
4793 | 4761 | if (r_ptr->flags3 & (RF3_GOOD)) |
4794 | 4762 | { |
4795 | - if (seen) | |
4796 | - { | |
4797 | - /* Learn about type */ | |
4798 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); | |
4763 | + /* Obvious */ | |
4764 | + if (seen) obvious = TRUE; | |
4799 | 4765 | |
4800 | - /* Obvious */ | |
4801 | - obvious = TRUE; | |
4802 | - } | |
4766 | + /* Learn about type */ | |
4767 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); | |
4803 | 4768 | |
4804 | 4769 | /* Message */ |
4805 | 4770 | #ifdef JP |
4806 | -note = "は身震いした。"; | |
4807 | -note_dies = "はドロドロに溶けた!"; | |
4771 | + note = "は身震いした。"; | |
4772 | + note_dies = "はドロドロに溶けた!"; | |
4808 | 4773 | #else |
4809 | 4774 | note = " shudders."; |
4810 | 4775 | note_dies = " dissolves!"; |
4811 | 4776 | #endif |
4812 | - | |
4813 | 4777 | } |
4814 | 4778 | |
4815 | 4779 | /* Others ignore */ |
@@ -4876,24 +4840,20 @@ note_dies = " | ||
4876 | 4840 | /* Only affect demons */ |
4877 | 4841 | if (r_ptr->flags3 & (RF3_DEMON)) |
4878 | 4842 | { |
4879 | - if (seen) | |
4880 | - { | |
4881 | - /* Learn about type */ | |
4882 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); | |
4843 | + /* Obvious */ | |
4844 | + if (seen) obvious = TRUE; | |
4883 | 4845 | |
4884 | - /* Obvious */ | |
4885 | - obvious = TRUE; | |
4886 | - } | |
4846 | + /* Learn about type */ | |
4847 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); | |
4887 | 4848 | |
4888 | 4849 | /* Message */ |
4889 | 4850 | #ifdef JP |
4890 | -note = "は身震いした。"; | |
4891 | -note_dies = "はドロドロに溶けた!"; | |
4851 | + note = "は身震いした。"; | |
4852 | + note_dies = "はドロドロに溶けた!"; | |
4892 | 4853 | #else |
4893 | 4854 | note = " shudders."; |
4894 | 4855 | note_dies = " dissolves!"; |
4895 | 4856 | #endif |
4896 | - | |
4897 | 4857 | } |
4898 | 4858 | |
4899 | 4859 | /* Others ignore */ |
@@ -4947,7 +4907,7 @@ note_dies = " | ||
4947 | 4907 | note = " is immune."; |
4948 | 4908 | #endif |
4949 | 4909 | skipped = TRUE; |
4950 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4910 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4951 | 4911 | break; |
4952 | 4912 | } |
4953 | 4913 |
@@ -5022,7 +4982,7 @@ note_dies = " | ||
5022 | 4982 | note = " is immune."; |
5023 | 4983 | #endif |
5024 | 4984 | skipped = TRUE; |
5025 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
4985 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5026 | 4986 | break; |
5027 | 4987 | } |
5028 | 4988 |
@@ -5034,7 +4994,7 @@ note_dies = " | ||
5034 | 4994 | /* Memorize a flag */ |
5035 | 4995 | if (r_ptr->flags3 & (RF3_NO_CONF)) |
5036 | 4996 | { |
5037 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
4997 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
5038 | 4998 | } |
5039 | 4999 | #ifdef JP |
5040 | 5000 | note = "には効果がなかった。"; |
@@ -5045,7 +5005,7 @@ note_dies = " | ||
5045 | 5005 | } |
5046 | 5006 | else if (r_ptr->flags2 & RF2_EMPTY_MIND) |
5047 | 5007 | { |
5048 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
5008 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
5049 | 5009 | #ifdef JP |
5050 | 5010 | note = "には完全な耐性がある!"; |
5051 | 5011 | #else |
@@ -5055,7 +5015,7 @@ note_dies = " | ||
5055 | 5015 | } |
5056 | 5016 | else if (r_ptr->flags2 & RF2_WEIRD_MIND) |
5057 | 5017 | { |
5058 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); | |
5018 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); | |
5059 | 5019 | #ifdef JP |
5060 | 5020 | note = "には耐性がある。"; |
5061 | 5021 | #else |
@@ -5098,7 +5058,7 @@ note_dies = " | ||
5098 | 5058 | note = " is immune."; |
5099 | 5059 | #endif |
5100 | 5060 | skipped = TRUE; |
5101 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5061 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5102 | 5062 | break; |
5103 | 5063 | } |
5104 | 5064 |
@@ -5110,7 +5070,7 @@ note_dies = " | ||
5110 | 5070 | /* Memorize a flag */ |
5111 | 5071 | if (r_ptr->flags3 & (RF3_NO_CONF)) |
5112 | 5072 | { |
5113 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
5073 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); | |
5114 | 5074 | } |
5115 | 5075 | #ifdef JP |
5116 | 5076 | note = "には効果がなかった。"; |
@@ -5121,7 +5081,7 @@ note_dies = " | ||
5121 | 5081 | } |
5122 | 5082 | else if (r_ptr->flags2 & RF2_EMPTY_MIND) |
5123 | 5083 | { |
5124 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
5084 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
5125 | 5085 | #ifdef JP |
5126 | 5086 | note = "には完全な耐性がある!"; |
5127 | 5087 | #else |
@@ -5131,7 +5091,7 @@ note_dies = " | ||
5131 | 5091 | } |
5132 | 5092 | else if (r_ptr->flags2 & RF2_WEIRD_MIND) |
5133 | 5093 | { |
5134 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); | |
5094 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_WEIRD_MIND); | |
5135 | 5095 | #ifdef JP |
5136 | 5096 | note = "には耐性がある。"; |
5137 | 5097 | #else |
@@ -5185,7 +5145,7 @@ note_dies = " | ||
5185 | 5145 | note = " is immune."; |
5186 | 5146 | #endif |
5187 | 5147 | skipped = TRUE; |
5188 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5148 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5189 | 5149 | break; |
5190 | 5150 | } |
5191 | 5151 |
@@ -5221,7 +5181,7 @@ note_dies = " | ||
5221 | 5181 | note = " is immune."; |
5222 | 5182 | #endif |
5223 | 5183 | skipped = TRUE; |
5224 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5184 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5225 | 5185 | break; |
5226 | 5186 | } |
5227 | 5187 |
@@ -5257,7 +5217,7 @@ note_dies = " | ||
5257 | 5217 | note = " is immune."; |
5258 | 5218 | #endif |
5259 | 5219 | skipped = TRUE; |
5260 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5220 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5261 | 5221 | break; |
5262 | 5222 | } |
5263 | 5223 |
@@ -5293,7 +5253,7 @@ note_dies = " | ||
5293 | 5253 | note = " is immune."; |
5294 | 5254 | #endif |
5295 | 5255 | skipped = TRUE; |
5296 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5256 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5297 | 5257 | break; |
5298 | 5258 | } |
5299 | 5259 |
@@ -5323,7 +5283,7 @@ note_dies = " | ||
5323 | 5283 | note = " is immune."; |
5324 | 5284 | #endif |
5325 | 5285 | skipped = TRUE; |
5326 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5286 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5327 | 5287 | break; |
5328 | 5288 | } |
5329 | 5289 |
@@ -5456,7 +5416,7 @@ msg_format(" | ||
5456 | 5416 | note = " is immune."; |
5457 | 5417 | #endif |
5458 | 5418 | dam = 0; |
5459 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5419 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5460 | 5420 | break; |
5461 | 5421 | } |
5462 | 5422 | if (r_ptr->flags2 & RF2_EMPTY_MIND) |
@@ -5468,7 +5428,7 @@ note = " | ||
5468 | 5428 | #endif |
5469 | 5429 | dam = 0; |
5470 | 5430 | skipped = TRUE; |
5471 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
5431 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags2 |= (RF2_EMPTY_MIND); | |
5472 | 5432 | break; |
5473 | 5433 | } |
5474 | 5434 | if (m_ptr->csleep) |
@@ -5553,7 +5513,7 @@ note = " | ||
5553 | 5513 | /* Memorize a flag */ |
5554 | 5514 | if (r_ptr->flags3 & RF3_NO_SLEEP) |
5555 | 5515 | { |
5556 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); | |
5516 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_SLEEP); | |
5557 | 5517 | } |
5558 | 5518 | |
5559 | 5519 | /* No obvious effect */ |
@@ -5606,7 +5566,7 @@ note = " | ||
5606 | 5566 | note = " is immune."; |
5607 | 5567 | #endif |
5608 | 5568 | skipped = TRUE; |
5609 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5569 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5610 | 5570 | break; |
5611 | 5571 | } |
5612 | 5572 |
@@ -5673,14 +5633,11 @@ note = " | ||
5673 | 5633 | /* Hurt by light */ |
5674 | 5634 | if (r_ptr->flags3 & (RF3_HURT_LITE)) |
5675 | 5635 | { |
5676 | - if (seen) | |
5677 | - { | |
5678 | - /* Obvious effect */ | |
5679 | - obvious = TRUE; | |
5636 | + /* Obvious effect */ | |
5637 | + if (seen) obvious = TRUE; | |
5680 | 5638 | |
5681 | - /* Memorize the effects */ | |
5682 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); | |
5683 | - } | |
5639 | + /* Memorize the effects */ | |
5640 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_HURT_LITE); | |
5684 | 5641 | |
5685 | 5642 | /* Special effect */ |
5686 | 5643 | #ifdef JP |
@@ -5690,7 +5647,6 @@ note = " | ||
5690 | 5647 | note = " cringes from the light!"; |
5691 | 5648 | note_dies = " shrivels away in the light!"; |
5692 | 5649 | #endif |
5693 | - | |
5694 | 5650 | } |
5695 | 5651 | |
5696 | 5652 | /* Normally no damage */ |
@@ -5719,7 +5675,7 @@ note = " | ||
5719 | 5675 | note = " is immune."; |
5720 | 5676 | #endif |
5721 | 5677 | dam = 0; |
5722 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5678 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5723 | 5679 | break; |
5724 | 5680 | } |
5725 | 5681 | break; |
@@ -5770,7 +5726,7 @@ note = " | ||
5770 | 5726 | m_ptr->fast = MIN(200, m_ptr->fast + 100); |
5771 | 5727 | |
5772 | 5728 | /* Learn about type */ |
5773 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); | |
5729 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); | |
5774 | 5730 | success = TRUE; |
5775 | 5731 | } |
5776 | 5732 | } |
@@ -5781,10 +5737,7 @@ note = " | ||
5781 | 5737 | { |
5782 | 5738 | do_fear = randint1(90)+10; |
5783 | 5739 | } |
5784 | - else if (seen) | |
5785 | - { | |
5786 | - if (is_original_ap(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_FEAR); | |
5787 | - } | |
5740 | + else if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_NO_FEAR); | |
5788 | 5741 | } |
5789 | 5742 | |
5790 | 5743 | /* No "real" damage */ |
@@ -5804,7 +5757,7 @@ note = " | ||
5804 | 5757 | note = " is immune."; |
5805 | 5758 | #endif |
5806 | 5759 | skipped = TRUE; |
5807 | - if (seen && is_original_ap(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5760 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); | |
5808 | 5761 | break; |
5809 | 5762 | } |
5810 | 5763 |
@@ -9056,7 +9009,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons | ||
9056 | 9009 | msg_print("The attack bounces!"); |
9057 | 9010 | #endif |
9058 | 9011 | } |
9059 | - if (m_ptr->ml && is_original_ap(m_ptr)) ref_ptr->r_flags2 |= RF2_REFLECTING; | |
9012 | + if (is_original_ap_and_seen(m_ptr)) ref_ptr->r_flags2 |= RF2_REFLECTING; | |
9060 | 9013 | |
9061 | 9014 | /* Reflected bolts randomly target either one */ |
9062 | 9015 | if (one_in_(2)) flg |= PROJECT_PLAYER; |
@@ -6673,12 +6673,12 @@ msg_print(" | ||
6673 | 6673 | if (r_ptr->flagsr & RFR_RES_TELE) |
6674 | 6674 | { |
6675 | 6675 | #ifdef JP |
6676 | -msg_print("テレポートを邪魔された!"); | |
6676 | + msg_print("テレポートを邪魔された!"); | |
6677 | 6677 | #else |
6678 | 6678 | msg_print("Your teleportation is blocked!"); |
6679 | 6679 | #endif |
6680 | 6680 | |
6681 | - if (m_ptr->ml && is_original_ap(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
6681 | + if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; | |
6682 | 6682 | |
6683 | 6683 | m_ptr->csleep = 0; |
6684 | 6684 | if (r_ptr->flags7 & RF7_HAS_LD_MASK) p_ptr->update |= (PU_MON_LITE); |