| Revision | 246510a0c22ef0a70291d80619d6c1f6aba9316f (tree) |
|---|---|
| Time | 2012-12-24 11:18:29 |
| Author | dis- <dis-@0568...> |
| Commiter | dis- |
Update compare_weapon. -- Reduce the rounded up error.
src/bldg.c (diff)| @@ -3148,12 +3148,11 @@ static s16b calc_expext_cirt(int weight, int plus, int dam, s16b meichuu, bool d | ||
| 3148 | 3148 | if (i > (900-650) && weight<1300) num += (3 * dam + 20) * (1300 - MIN(1300, MAX(900, i))); |
| 3149 | 3149 | if (i > (1300-650)) num += (7 * dam / 2 + 25) * (i+650-1300); |
| 3150 | 3150 | |
| 3151 | - num /= 650; | |
| 3152 | 3151 | if(p_ptr->pclass == CLASS_NINJA) |
| 3153 | 3152 | { |
| 3154 | 3153 | num *= i; |
| 3155 | 3154 | num /= 4444; |
| 3156 | - tmp = (4444 - i) * dam; | |
| 3155 | + tmp = (4444 - i) * dam * 650; | |
| 3157 | 3156 | tmp /= 4444; |
| 3158 | 3157 | num += tmp; |
| 3159 | 3158 | } |
| @@ -3161,10 +3160,12 @@ static s16b calc_expext_cirt(int weight, int plus, int dam, s16b meichuu, bool d | ||
| 3161 | 3160 | { |
| 3162 | 3161 | num *= i; |
| 3163 | 3162 | num /= 5000; |
| 3164 | - tmp = (5000 - i) * dam; | |
| 3163 | + tmp = (5000 - i) * dam * 650; | |
| 3165 | 3164 | tmp /= 5000; |
| 3166 | 3165 | num += tmp; |
| 3167 | 3166 | } |
| 3167 | + num /= 650; | |
| 3168 | + | |
| 3168 | 3169 | return num; |
| 3169 | 3170 | } |
| 3170 | 3171 |
Fork