| … | |
… | |
| 33 | static const int con_bonus[MAX_STAT + 1] = { |
33 | static const int con_bonus[MAX_STAT + 1] = { |
| 34 | -6, -5, -4, -3, -2, -1, -1, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20, |
34 | -6, -5, -4, -3, -2, -1, -1, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20, |
| 35 | 22, 25, 30, 40, 50 |
35 | 22, 25, 30, 40, 50 |
| 36 | }; |
36 | }; |
| 37 | |
37 | |
| 38 | /* changed the name of this to "sp_bonus" from "int_bonus" |
38 | /* changed the name of this to "sp_bonus" from "int_bonus" |
| 39 | * because Pow can now be the stat that controls spellpoint |
39 | * because Pow can now be the stat that controls spellpoint |
| 40 | * advancement. -b.t. |
40 | * advancement. -b.t. |
| 41 | */ |
41 | */ |
| 42 | static const int sp_bonus[MAX_STAT + 1] = { |
42 | static const int sp_bonus[MAX_STAT + 1] = { |
| 43 | -10, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 25, |
43 | -10, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 25, |
| … | |
… | |
| 730 | */ |
730 | */ |
| 731 | void |
731 | void |
| 732 | object::update_stats () |
732 | object::update_stats () |
| 733 | { |
733 | { |
| 734 | float max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1; |
734 | float max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1; |
| 735 | int weapon_weight = 0, weapon_speed = 0; |
735 | weight_t weapon_weight = 0; |
|
|
736 | int weapon_speed = 0; |
| 736 | int best_wc = 0, best_ac = 0, wc = 0, ac = 0; |
737 | int best_wc = 0, best_ac = 0, wc = 0, ac = 0; |
| 737 | int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; |
738 | int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; |
| 738 | object *grace_obj = NULL, *mana_obj = NULL, *tmp; |
739 | object *grace_obj = NULL, *mana_obj = NULL, *tmp; |
| 739 | float old_speed = speed; |
740 | float old_speed = speed; |
| 740 | int stat_sum [NUM_STATS]; |
741 | int stat_sum [NUM_STATS]; |
| … | |
… | |
| 1289 | /* f is a number the represents the number of kg above (positive num) |
1290 | /* f is a number the represents the number of kg above (positive num) |
| 1290 | * or below (negative number) that the player is carrying. If above |
1291 | * or below (negative number) that the player is carrying. If above |
| 1291 | * weight limit, then player suffers a speed reduction based on how |
1292 | * weight limit, then player suffers a speed reduction based on how |
| 1292 | * much above he is, and what is max carry is |
1293 | * much above he is, and what is max carry is |
| 1293 | */ |
1294 | */ |
| 1294 | double f = weight_to_kg_approx (carrying) - max_carry[stats.Str]; |
1295 | float f = (sint32)weight_to_kg_approx (carrying) - max_carry[stats.Str]; |
| 1295 | if (f > 0.f) |
1296 | if (f > 0.f) |
| 1296 | speed /= (1.f + f / max_carry[stats.Str]); |
1297 | speed /= (1.f + f / max_carry[stats.Str]); |
| 1297 | } |
1298 | } |
| 1298 | |
1299 | |
| 1299 | speed += bonus_speed / 10.f; /* Not affected by limits */ |
1300 | speed += bonus_speed / 10.f; /* Not affected by limits */ |
