変愚蛮怒のメインリポジトリです
Revision | 10f968c56ea953805bcc3e3313123c739f196955 (tree) |
---|---|
Time | 2018-11-27 23:48:50 |
Author | Deskull <deskull@user...> |
Commiter | Deskull |
[Refactor] #37353 コメント整理 / Refactor comments.
@@ -1363,7 +1363,6 @@ static void process_world_aux_digestion(void) | ||
1363 | 1363 | /* Calculate damage */ |
1364 | 1364 | HIT_POINT dam = (PY_FOOD_STARVE - p_ptr->food) / 10; |
1365 | 1365 | |
1366 | - /* Take damage */ | |
1367 | 1366 | if (!IS_INVULN()) take_hit(DAMAGE_LOSELIFE, dam, _("空腹", "starvation"), -1); |
1368 | 1367 | } |
1369 | 1368 | } |
@@ -1390,7 +1389,6 @@ static void process_world_aux_hp_and_sp(void) | ||
1390 | 1389 | /* Take damage from poison */ |
1391 | 1390 | if (p_ptr->poisoned && !IS_INVULN()) |
1392 | 1391 | { |
1393 | - /* Take damage */ | |
1394 | 1392 | take_hit(DAMAGE_NOESCAPE, 1, _("毒", "poison"), -1); |
1395 | 1393 | } |
1396 | 1394 |
@@ -1437,7 +1435,6 @@ static void process_world_aux_hp_and_sp(void) | ||
1437 | 1435 | dam = 1; |
1438 | 1436 | } |
1439 | 1437 | |
1440 | - /* Take damage */ | |
1441 | 1438 | take_hit(DAMAGE_NOESCAPE, dam, _("致命傷", "a fatal wound"), -1); |
1442 | 1439 | } |
1443 | 1440 |
@@ -1448,7 +1445,6 @@ static void process_world_aux_hp_and_sp(void) | ||
1448 | 1445 | { |
1449 | 1446 | if ((cave[p_ptr->y][p_ptr->x].info & (CAVE_GLOW | CAVE_MNDK)) == CAVE_GLOW) |
1450 | 1447 | { |
1451 | - /* Take damage */ | |
1452 | 1448 | msg_print(_("日光があなたのアンデッドの肉体を焼き焦がした!", "The sun's rays scorch your undead flesh!")); |
1453 | 1449 | take_hit(DAMAGE_NOESCAPE, 1, _("日光", "sunlight"), -1); |
1454 | 1450 | cave_no_regen = TRUE; |
@@ -1520,7 +1516,6 @@ static void process_world_aux_hp_and_sp(void) | ||
1520 | 1516 | { |
1521 | 1517 | if (p_ptr->total_weight > weight_limit()) |
1522 | 1518 | { |
1523 | - /* Take damage */ | |
1524 | 1519 | msg_print(_("溺れている!", "You are drowning!")); |
1525 | 1520 | take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->lev), _("溺れ", "drowning"), -1); |
1526 | 1521 | cave_no_regen = TRUE; |
@@ -1981,7 +1981,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
1981 | 1981 | msg_print(_("痛恨の一撃!", "It was a critical hit!")); |
1982 | 1982 | tmp_damage = MAX(damage, tmp_damage*2); |
1983 | 1983 | |
1984 | - /* Take damage */ | |
1985 | 1984 | get_damage += take_hit(DAMAGE_ATTACK, tmp_damage, ddesc, -1); |
1986 | 1985 | break; |
1987 | 1986 | } |
@@ -1994,7 +1993,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
1994 | 1993 | /* Hack -- Player armor reduces total damage */ |
1995 | 1994 | damage -= (damage * ((ac < 150) ? ac : 150) / 250); |
1996 | 1995 | |
1997 | - /* Take damage */ | |
1998 | 1996 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
1999 | 1997 | |
2000 | 1998 | break; |
@@ -2435,7 +2433,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2435 | 2433 | |
2436 | 2434 | case RBE_BLIND: |
2437 | 2435 | { |
2438 | - /* Take damage */ | |
2439 | 2436 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2440 | 2437 | |
2441 | 2438 | if (p_ptr->is_dead) break; |
@@ -2463,7 +2460,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2463 | 2460 | case RBE_CONFUSE: |
2464 | 2461 | { |
2465 | 2462 | if (explode) break; |
2466 | - /* Take damage */ | |
2467 | 2463 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2468 | 2464 | |
2469 | 2465 | if (p_ptr->is_dead) break; |
@@ -2485,7 +2481,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2485 | 2481 | |
2486 | 2482 | case RBE_TERRIFY: |
2487 | 2483 | { |
2488 | - /* Take damage */ | |
2489 | 2484 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2490 | 2485 | |
2491 | 2486 | if (p_ptr->is_dead) break; |
@@ -2521,7 +2516,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2521 | 2516 | |
2522 | 2517 | case RBE_PARALYZE: |
2523 | 2518 | { |
2524 | - /* Take damage */ | |
2525 | 2519 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2526 | 2520 | |
2527 | 2521 | if (p_ptr->is_dead) break; |
@@ -2662,7 +2656,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2662 | 2656 | /* Hack -- Reduce damage based on the player armor class */ |
2663 | 2657 | damage -= (damage * ((ac < 150) ? ac : 150) / 250); |
2664 | 2658 | |
2665 | - /* Take damage */ | |
2666 | 2659 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2667 | 2660 | |
2668 | 2661 | /* Radius 8 earthquake centered at the monster */ |
@@ -2681,7 +2674,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2681 | 2674 | /* Obvious */ |
2682 | 2675 | obvious = TRUE; |
2683 | 2676 | |
2684 | - /* Take damage */ | |
2685 | 2677 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2686 | 2678 | |
2687 | 2679 | if (p_ptr->is_dead || CHECK_MULTISHADOW()) break; |
@@ -2697,7 +2689,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2697 | 2689 | /* Obvious */ |
2698 | 2690 | obvious = TRUE; |
2699 | 2691 | |
2700 | - /* Take damage */ | |
2701 | 2692 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2702 | 2693 | |
2703 | 2694 | if (p_ptr->is_dead || CHECK_MULTISHADOW()) break; |
@@ -2713,7 +2704,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2713 | 2704 | /* Obvious */ |
2714 | 2705 | obvious = TRUE; |
2715 | 2706 | |
2716 | - /* Take damage */ | |
2717 | 2707 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2718 | 2708 | |
2719 | 2709 | if (p_ptr->is_dead || CHECK_MULTISHADOW()) break; |
@@ -2729,7 +2719,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2729 | 2719 | /* Obvious */ |
2730 | 2720 | obvious = TRUE; |
2731 | 2721 | |
2732 | - /* Take damage */ | |
2733 | 2722 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2734 | 2723 | |
2735 | 2724 | if (p_ptr->is_dead || CHECK_MULTISHADOW()) break; |
@@ -2840,7 +2829,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2840 | 2829 | /* Obvious */ |
2841 | 2830 | obvious = TRUE; |
2842 | 2831 | |
2843 | - /* Take damage */ | |
2844 | 2832 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2845 | 2833 | |
2846 | 2834 | if (p_ptr->is_dead || CHECK_MULTISHADOW()) break; |
@@ -2905,7 +2893,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2905 | 2893 | { |
2906 | 2894 | do_cut = 0; |
2907 | 2895 | |
2908 | - /* Take damage */ | |
2909 | 2896 | p_ptr->csp -= damage; |
2910 | 2897 | if (p_ptr->csp < 0) |
2911 | 2898 | { |
@@ -2923,7 +2910,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2923 | 2910 | } |
2924 | 2911 | case RBE_INERTIA: |
2925 | 2912 | { |
2926 | - /* Take damage */ | |
2927 | 2913 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2928 | 2914 | |
2929 | 2915 | if (p_ptr->is_dead) break; |
@@ -2945,7 +2931,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) | ||
2945 | 2931 | } |
2946 | 2932 | case RBE_STUN: |
2947 | 2933 | { |
2948 | - /* Take damage */ | |
2949 | 2934 | get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1); |
2950 | 2935 | |
2951 | 2936 | if (p_ptr->is_dead) break; |
@@ -433,7 +433,6 @@ HIT_POINT acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) | ||
433 | 433 | if (minus_ac()) dam = (dam + 1) / 2; |
434 | 434 | } |
435 | 435 | |
436 | - /* Take damage */ | |
437 | 436 | get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell); |
438 | 437 | |
439 | 438 | /* Inventory damage */ |
@@ -481,7 +480,6 @@ HIT_POINT elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) | ||
481 | 480 | (void)do_dec_stat(A_DEX); |
482 | 481 | } |
483 | 482 | |
484 | - /* Take damage */ | |
485 | 483 | get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell); |
486 | 484 | |
487 | 485 | /* Inventory damage */ |
@@ -530,7 +528,6 @@ HIT_POINT fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) | ||
530 | 528 | (void)do_dec_stat(A_STR); |
531 | 529 | } |
532 | 530 | |
533 | - /* Take damage */ | |
534 | 531 | get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell); |
535 | 532 | |
536 | 533 | /* Inventory damage */ |
@@ -578,7 +575,6 @@ HIT_POINT cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura) | ||
578 | 575 | (void)do_dec_stat(A_STR); |
579 | 576 | } |
580 | 577 | |
581 | - /* Take damage */ | |
582 | 578 | get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell); |
583 | 579 | |
584 | 580 | /* Inventory damage */ |
@@ -1116,7 +1116,6 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, | ||
1116 | 1116 | |
1117 | 1117 | if (player_cast) |
1118 | 1118 | { |
1119 | - /* Take damage */ | |
1120 | 1119 | take_hit(DAMAGE_GENO, randint1(dam_side), format(_("%^sの呪文を唱えた疲労", "the strain of casting %^s"), spell_name), -1); |
1121 | 1120 | } |
1122 | 1121 |