変愚蛮怒のメインリポジトリです
Revision | de9eaeda62bd461095cbcad69f0a1b0c04e99f0a (tree) |
---|---|
Time | 2018-12-15 21:39:19 |
Author | Deskull <deskull@user...> |
Commiter | Deskull |
[Fix] #38796 calc_bonuses()調整。 / Fix calc_bonuses().
@@ -3776,14 +3776,6 @@ void calc_bonuses(void) | ||
3776 | 3776 | break; |
3777 | 3777 | case RACE_MERFOLK: |
3778 | 3778 | p_ptr->resist_water = TRUE; |
3779 | - if(have_flag(f_ptr->flags, FF_WATER)) | |
3780 | - { | |
3781 | - new_speed += (2 + p_ptr->lev / 10); | |
3782 | - } | |
3783 | - else if(!p_ptr->levitation) | |
3784 | - { | |
3785 | - new_speed -= 2; | |
3786 | - } | |
3787 | 3779 | break; |
3788 | 3780 | default: |
3789 | 3781 | /* Do nothing */ |
@@ -4898,6 +4890,20 @@ void calc_bonuses(void) | ||
4898 | 4890 | /* Searching slows the player down */ |
4899 | 4891 | if (p_ptr->action == ACTION_SEARCH) new_speed -= 10; |
4900 | 4892 | |
4893 | + /* Feature bonus */ | |
4894 | + if(p_ptr->prace == RACE_MERFOLK) | |
4895 | + { | |
4896 | + if (have_flag(f_ptr->flags, FF_WATER)) | |
4897 | + { | |
4898 | + new_speed += (2 + p_ptr->lev / 10); | |
4899 | + } | |
4900 | + else if (!p_ptr->levitation) | |
4901 | + { | |
4902 | + new_speed -= 2; | |
4903 | + } | |
4904 | + } | |
4905 | + | |
4906 | + | |
4901 | 4907 | /* Actual Modifier Bonuses (Un-inflate stat bonuses) */ |
4902 | 4908 | p_ptr->to_a += ((int)(adj_dex_ta[p_ptr->stat_ind[A_DEX]]) - 128); |
4903 | 4909 | p_ptr->to_d[0] += ((int)(adj_str_td[p_ptr->stat_ind[A_STR]]) - 128); |