| … | |
… | |
| 926 | speed = arch->clone.speed; |
926 | speed = arch->clone.speed; |
| 927 | |
927 | |
| 928 | /* OK - we've reset most all the objects attributes to sane values. |
928 | /* OK - we've reset most all the objects attributes to sane values. |
| 929 | * now go through and make adjustments for what the player has equipped. |
929 | * now go through and make adjustments for what the player has equipped. |
| 930 | */ |
930 | */ |
| 931 | |
|
|
| 932 | for (tmp = inv; tmp; tmp = tmp->below) |
931 | for (tmp = inv; tmp; tmp = tmp->below) |
| 933 | { |
932 | { |
| 934 | /* See note in map.c:update_position about making this additive |
933 | /* See note in map.c:update_position about making this additive |
| 935 | * since light sources are never applied, need to put check here. |
934 | * since light sources are never applied, need to put check here. |
| 936 | */ |
935 | */ |
| … | |
… | |
| 1021 | if (speed_reduce_from_disease == 0) |
1020 | if (speed_reduce_from_disease == 0) |
| 1022 | speed_reduce_from_disease = 1; |
1021 | speed_reduce_from_disease = 1; |
| 1023 | } |
1022 | } |
| 1024 | |
1023 | |
| 1025 | /* Pos. and neg. protections are counted seperate (-> pro/vuln). |
1024 | /* Pos. and neg. protections are counted seperate (-> pro/vuln). |
| 1026 | * (Negative protections are calculated extactly like positive.) |
1025 | * (Negative protections are calculated exactly like positive.) |
| 1027 | * Resistance from potions are treated special as well. If there's |
1026 | * Resistance from potions are treated special as well. If there's |
| 1028 | * more than one potion-effect, the bigger prot.-value is taken. |
1027 | * more than one potion-effect, the bigger prot.-value is taken. |
| 1029 | */ |
1028 | */ |
| 1030 | if (tmp->type != POTION) |
1029 | if (tmp->type != POTION) |
| 1031 | { |
1030 | { |
| … | |
… | |
| 1040 | potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); |
1039 | potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); |
| 1041 | else |
1040 | else |
| 1042 | potion_resist[i] = tmp->resist[i]; |
1041 | potion_resist[i] = tmp->resist[i]; |
| 1043 | } |
1042 | } |
| 1044 | else if (tmp->resist[i] > 0) |
1043 | else if (tmp->resist[i] > 0) |
| 1045 | prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; |
1044 | prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; |
| 1046 | else if (tmp->resist[i] < 0) |
1045 | else if (tmp->resist[i] < 0) |
| 1047 | vuln[i] += ((100 - vuln[i]) * (-tmp->resist[i])) / 100; |
1046 | vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; |
| 1048 | } |
1047 | } |
| 1049 | } |
1048 | } |
| 1050 | |
1049 | |
| 1051 | /* There may be other things that should not adjust the attacktype */ |
1050 | /* There may be other things that should not adjust the attacktype */ |
| 1052 | if (tmp->type != BOW && tmp->type != SYMPTOM) |
1051 | if (tmp->type != BOW && tmp->type != SYMPTOM) |
