| … | |
… | |
| 224 | "You feel stupid!", |
224 | "You feel stupid!", |
| 225 | "You feel less potent!" |
225 | "You feel less potent!" |
| 226 | }; |
226 | }; |
| 227 | |
227 | |
| 228 | const char *const statname[NUM_STATS] = { |
228 | const char *const statname[NUM_STATS] = { |
| 229 | "strength", "dexterity", "constitution", "wisdom", "charisma", "intelligence", "power" |
229 | "strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma" |
| 230 | }; |
230 | }; |
| 231 | |
231 | |
| 232 | const char *const short_stat_name[NUM_STATS] = { |
232 | const char *const short_stat_name[NUM_STATS] = { |
| 233 | "Str", "Dex", "Con", "Wis", "Cha", "Int", "Pow" |
233 | "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha" |
| 234 | }; |
234 | }; |
| 235 | |
235 | |
| 236 | /* |
236 | /* |
| 237 | * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on |
237 | * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on |
| 238 | * what attr is (STR to POW). |
238 | * what attr is (STR to POW). |
| … | |
… | |
| 832 | float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; |
832 | float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; |
| 833 | int weapon_weight = 0, weapon_speed = 0; |
833 | int weapon_weight = 0, weapon_speed = 0; |
| 834 | int best_wc = 0, best_ac = 0, wc = 0, ac = 0; |
834 | int best_wc = 0, best_ac = 0, wc = 0, ac = 0; |
| 835 | int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; |
835 | int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; |
| 836 | object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; |
836 | object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; |
|
|
837 | float old_speed = speed; |
| 837 | |
838 | |
| 838 | /* First task is to clear all the values back to their original values */ |
839 | /* First task is to clear all the values back to their original values */ |
| 839 | if (type == PLAYER) |
840 | if (type == PLAYER) |
| 840 | { |
841 | { |
| 841 | for (i = 0; i < NUM_STATS; i++) |
842 | for (i = 0; i < NUM_STATS; i++) |
| … | |
… | |
| 1028 | if (tmp->type != POTION) |
1029 | if (tmp->type != POTION) |
| 1029 | { |
1030 | { |
| 1030 | for (i = 0; i < NROFATTACKS; i++) |
1031 | for (i = 0; i < NROFATTACKS; i++) |
| 1031 | { |
1032 | { |
| 1032 | /* Potential for cursed potions, in which case we just can use |
1033 | /* Potential for cursed potions, in which case we just can use |
| 1033 | * a straight MAX, as potion_resist is initialized to zero. |
1034 | * a straight MAX, as potion_resist is initialised to zero. |
| 1034 | */ |
1035 | */ |
| 1035 | if (tmp->type == POTION_EFFECT) |
1036 | if (tmp->type == POTION_EFFECT) |
| 1036 | { |
1037 | { |
| 1037 | if (potion_resist[i]) |
1038 | if (potion_resist[i]) |
| 1038 | potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); |
1039 | potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); |
| … | |
… | |
| 1502 | if (move_type == 0) |
1503 | if (move_type == 0) |
| 1503 | move_type = MOVE_WALK; |
1504 | move_type = MOVE_WALK; |
| 1504 | else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) |
1505 | else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) |
| 1505 | move_type &= ~MOVE_WALK; |
1506 | move_type &= ~MOVE_WALK; |
| 1506 | |
1507 | |
| 1507 | update_ob_speed (this); |
1508 | if (speed != old_speed) |
|
|
1509 | set_speed (speed); |
| 1508 | |
1510 | |
| 1509 | /* It is quite possible that a player's spell costing might have changed, |
1511 | /* It is quite possible that a player's spell costing might have changed, |
| 1510 | * so we will check that now. |
1512 | * so we will check that now. |
| 1511 | */ |
1513 | */ |
| 1512 | if (type == PLAYER) |
1514 | if (type == PLAYER) |
