… | |
… | |
233 | const char *const short_stat_name[NUM_STATS] = { |
233 | const char *const short_stat_name[NUM_STATS] = { |
234 | "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha" |
234 | "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha" |
235 | }; |
235 | }; |
236 | |
236 | |
237 | /* |
237 | /* |
238 | * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on |
|
|
239 | * what attr is (STR to POW). |
|
|
240 | */ |
|
|
241 | void |
|
|
242 | set_attr_value (living *stats, int attr, sint8 value) |
|
|
243 | { |
|
|
244 | switch (attr) |
|
|
245 | { |
|
|
246 | case STR: |
|
|
247 | stats->Str = value; |
|
|
248 | break; |
|
|
249 | case DEX: |
|
|
250 | stats->Dex = value; |
|
|
251 | break; |
|
|
252 | case CON: |
|
|
253 | stats->Con = value; |
|
|
254 | break; |
|
|
255 | case WIS: |
|
|
256 | stats->Wis = value; |
|
|
257 | break; |
|
|
258 | case POW: |
|
|
259 | stats->Pow = value; |
|
|
260 | break; |
|
|
261 | case CHA: |
|
|
262 | stats->Cha = value; |
|
|
263 | break; |
|
|
264 | case INT: |
|
|
265 | stats->Int = value; |
|
|
266 | break; |
|
|
267 | } |
|
|
268 | } |
|
|
269 | |
|
|
270 | /* |
|
|
271 | * Like set_attr_value(), but instead the value (which can be negative) |
238 | * Like set_attr_value(), but instead the value (which can be negative) |
272 | * is added to the specified stat. |
239 | * is added to the specified stat. |
273 | */ |
240 | */ |
274 | void |
241 | void |
275 | change_attr_value (living *stats, int attr, sint8 value) |
242 | change_attr_value (living *stats, int attr, sint8 value) |
276 | { |
243 | { |
277 | if (value == 0) |
244 | stats->stat (attr) += value; |
278 | return; |
245 | } |
279 | |
246 | |
280 | switch (attr) |
247 | sint8 & |
281 | { |
248 | living::stat (int index) |
282 | case STR: |
249 | { |
283 | stats->Str += value; |
250 | switch (index) |
284 | break; |
|
|
285 | case DEX: |
|
|
286 | stats->Dex += value; |
|
|
287 | break; |
|
|
288 | case CON: |
|
|
289 | stats->Con += value; |
|
|
290 | break; |
|
|
291 | case WIS: |
|
|
292 | stats->Wis += value; |
|
|
293 | break; |
|
|
294 | case POW: |
|
|
295 | stats->Pow += value; |
|
|
296 | break; |
|
|
297 | case CHA: |
|
|
298 | stats->Cha += value; |
|
|
299 | break; |
|
|
300 | case INT: |
|
|
301 | stats->Int += value; |
|
|
302 | break; |
|
|
303 | default: |
|
|
304 | LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr); |
|
|
305 | } |
251 | { |
306 | } |
252 | case STR: return Str; |
|
|
253 | case DEX: return Dex; |
|
|
254 | case CON: return Con; |
|
|
255 | case INT: return Int; |
|
|
256 | case WIS: return Wis; |
|
|
257 | case POW: return Pow; |
|
|
258 | case CHA: return Cha; |
|
|
259 | } |
307 | |
260 | |
308 | /* |
261 | LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index"); |
309 | * returns the specified stat. See also set_attr_value(). |
262 | static sint8 dummy; |
310 | */ |
263 | return dummy; |
|
|
264 | } |
311 | |
265 | |
312 | sint8 |
266 | sint8 |
313 | get_attr_value (const living *stats, int attr) |
267 | living::stat (int index) const |
314 | { |
268 | { |
315 | switch (attr) |
269 | switch (index) |
316 | { |
270 | { |
317 | case STR: return stats->Str; |
271 | case STR: return Str; |
318 | case DEX: return stats->Dex; |
272 | case DEX: return Dex; |
319 | case CON: return stats->Con; |
273 | case CON: return Con; |
320 | case WIS: return stats->Wis; |
|
|
321 | case CHA: return stats->Cha; |
|
|
322 | case INT: return stats->Int; |
274 | case INT: return Int; |
|
|
275 | case WIS: return Wis; |
323 | case POW: return stats->Pow; |
276 | case POW: return Pow; |
|
|
277 | case CHA: return Cha; |
324 | } |
278 | } |
325 | |
279 | |
|
|
280 | LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index"); |
|
|
281 | static sint8 dummy; |
326 | return 0; |
282 | return dummy; |
327 | } |
283 | } |
328 | |
284 | |
329 | /* |
285 | /* |
330 | * Ensures that all stats (str/dex/con/wis/cha/int) are within the |
286 | * Ensures that all stats (str/dex/con/wis/cha/int) are within the |
331 | * 1-30 stat limit. |
287 | * 1-30 stat limit. |
332 | */ |
288 | */ |
333 | |
|
|
334 | void |
289 | void |
335 | check_stat_bounds (living *stats) |
290 | check_stat_bounds (living *stats) |
336 | { |
291 | { |
337 | int i, v; |
|
|
338 | |
|
|
339 | for (i = 0; i < NUM_STATS; i++) |
292 | for (int i = 0; i < NUM_STATS; i++) |
340 | if ((v = get_attr_value (stats, i)) > MAX_STAT) |
293 | { |
341 | set_attr_value (stats, i, MAX_STAT); |
294 | sint8 &v = stats->stat (i); |
342 | else if (v < MIN_STAT) |
295 | v = clamp (v, MIN_STAT, MAX_STAT); |
343 | set_attr_value (stats, i, MIN_STAT); |
296 | } |
344 | } |
297 | } |
345 | |
298 | |
346 | #define ORIG_S(xyz,abc) (op->contr->orig_stats.abc) |
299 | #define ORIG_S(xyz,abc) (op->contr->orig_stats.abc) |
347 | |
300 | |
348 | /* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, |
301 | /* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, |
… | |
… | |
385 | potion_max = 1; |
338 | potion_max = 1; |
386 | for (j = 0; j < NUM_STATS; j++) |
339 | for (j = 0; j < NUM_STATS; j++) |
387 | { |
340 | { |
388 | int nstat, ostat; |
341 | int nstat, ostat; |
389 | |
342 | |
390 | ostat = get_attr_value (&(op->contr->orig_stats), j); |
343 | ostat = op->contr->orig_stats.stat (j); |
391 | i = get_attr_value (&(tmp->stats), j); |
344 | i = tmp->stats.stat (j); |
392 | |
345 | |
393 | /* nstat is what the stat will be after use of the potion */ |
346 | /* nstat is what the stat will be after use of the potion */ |
394 | nstat = flag * i + ostat; |
347 | nstat = flag * i + ostat; |
395 | |
348 | |
396 | /* Do some bounds checking. While I don't think any |
349 | /* Do some bounds checking. While I don't think any |
… | |
… | |
398 | * that adjust that stat by more than one point, so we need |
351 | * that adjust that stat by more than one point, so we need |
399 | * to allow for that. |
352 | * to allow for that. |
400 | */ |
353 | */ |
401 | if (nstat < 1 && i * flag < 0) |
354 | if (nstat < 1 && i * flag < 0) |
402 | nstat = 1; |
355 | nstat = 1; |
403 | else if (nstat > 20 + get_attr_value (&op->arch->clone.stats, j)) |
356 | else if (nstat > 20 + op->arch->clone.stats.stat (j)) |
404 | nstat = 20 + get_attr_value (&op->arch->clone.stats, j); |
357 | nstat = 20 + op->arch->clone.stats.stat (j); |
405 | |
358 | |
406 | if (nstat != ostat) |
359 | if (nstat != ostat) |
407 | { |
360 | { |
408 | set_attr_value (&op->contr->orig_stats, j, nstat); |
361 | op->contr->orig_stats.stat (j) = nstat; |
409 | potion_max = 0; |
362 | potion_max = 0; |
410 | } |
363 | } |
411 | else if (i) |
364 | else if (i) |
412 | { |
365 | { |
413 | /* potion is useless - player has already hit the natural maximum */ |
366 | /* potion is useless - player has already hit the natural maximum */ |
… | |
… | |
418 | /* This section of code ups the characters normal stats also. I am not |
371 | /* This section of code ups the characters normal stats also. I am not |
419 | * sure if this is strictly necessary, being that fix_player probably |
372 | * sure if this is strictly necessary, being that fix_player probably |
420 | * recalculates this anyway. |
373 | * recalculates this anyway. |
421 | */ |
374 | */ |
422 | for (j = 0; j < NUM_STATS; j++) |
375 | for (j = 0; j < NUM_STATS; j++) |
423 | change_attr_value (&op->stats, j, flag * get_attr_value (&tmp->stats, j)); |
376 | change_attr_value (&op->stats, j, flag * tmp->stats.stat (j)); |
424 | |
377 | |
425 | check_stat_bounds (&op->stats); |
378 | check_stat_bounds (&op->stats); |
426 | } /* end of potion handling code */ |
379 | } /* end of potion handling code */ |
427 | } |
380 | } |
428 | |
381 | |
… | |
… | |
657 | |
610 | |
658 | if (!potion_max) |
611 | if (!potion_max) |
659 | { |
612 | { |
660 | for (j = 0; j < NUM_STATS; j++) |
613 | for (j = 0; j < NUM_STATS; j++) |
661 | { |
614 | { |
662 | if ((i = get_attr_value (&(tmp->stats), j)) != 0) |
615 | if ((i = tmp->stats.stat (j))) |
663 | { |
616 | { |
664 | success = 1; |
617 | success = 1; |
665 | DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); |
618 | DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); |
666 | } |
619 | } |
667 | } |
620 | } |
… | |
… | |
835 | |
788 | |
836 | /* First task is to clear all the values back to their original values */ |
789 | /* First task is to clear all the values back to their original values */ |
837 | if (type == PLAYER) |
790 | if (type == PLAYER) |
838 | { |
791 | { |
839 | for (i = 0; i < NUM_STATS; i++) |
792 | for (i = 0; i < NUM_STATS; i++) |
840 | set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i)); |
793 | stats.stat (i) = contr->orig_stats.stat (i); |
841 | |
794 | |
842 | if (settings.spell_encumbrance == TRUE) |
795 | if (settings.spell_encumbrance == TRUE) |
843 | contr->encumbrance = 0; |
796 | contr->encumbrance = 0; |
844 | |
797 | |
845 | attacktype = 0; |
798 | attacktype = 0; |
… | |
… | |
975 | if (tmp == contr->combat_ob || tmp == contr->ranged_ob) |
928 | if (tmp == contr->combat_ob || tmp == contr->ranged_ob) |
976 | if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)) |
929 | if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)) |
977 | continue; |
930 | continue; |
978 | |
931 | |
979 | for (i = 0; i < NUM_STATS; i++) |
932 | for (i = 0; i < NUM_STATS; i++) |
980 | change_attr_value (&stats, i, get_attr_value (&tmp->stats, i)); |
933 | change_attr_value (&stats, i, tmp->stats.stat (i)); |
981 | |
934 | |
982 | /* these are the items that currently can change digestion, regeneration, |
935 | /* these are the items that currently can change digestion, regeneration, |
983 | * spell point recovery and mana point recovery. Seems sort of an arbitary |
936 | * spell point recovery and mana point recovery. Seems sort of an arbitary |
984 | * list, but other items store other info into stats array. |
937 | * list, but other items store other info into stats array. |
985 | */ |
938 | */ |