ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.45 by root, Mon Apr 30 04:25:29 2007 UTC vs.
Revision 1.116 by root, Sun Apr 4 04:10:47 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h>
27 26
28/* Handy little macro that adds exp and keeps it within bounds. Since 27/* Handy little macro that adds exp and keeps it within bounds. Since
29 * we are now using 64 bit values, I'm not all concerned about overflow issues 28 * we are now using 64 bit values, I'm not all concerned about overflow issues
30 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp 29 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp
31 */ 30 */
… …
233const char *const short_stat_name[NUM_STATS] = { 232const char *const short_stat_name[NUM_STATS] = {
234 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha" 233 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"
235}; 234};
236 235
237/* 236/*
238 * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
239 * what attr is (STR to POW).
240 */
241void
242set_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) 237 * Like set_attr_value(), but instead the value (which can be negative)
272 * is added to the specified stat. 238 * is added to the specified stat.
273 */ 239 */
274void 240void
275change_attr_value (living *stats, int attr, sint8 value) 241change_attr_value (living *stats, int attr, sint8 value)
276{ 242{
277 if (value == 0) 243 stats->stat (attr) += value;
278 return;
279
280 switch (attr)
281 {
282 case STR:
283 stats->Str += value;
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 }
306}
307
308/*
309 * returns the specified stat. See also set_attr_value().
310 */
311
312sint8
313get_attr_value (const living *stats, int attr)
314{
315 switch (attr)
316 {
317 case STR: return stats->Str;
318 case DEX: return stats->Dex;
319 case CON: return stats->Con;
320 case WIS: return stats->Wis;
321 case CHA: return stats->Cha;
322 case INT: return stats->Int;
323 case POW: return stats->Pow;
324 }
325
326 return 0;
327} 244}
328 245
329/* 246/*
330 * Ensures that all stats (str/dex/con/wis/cha/int) are within the 247 * Ensures that all stats (str/dex/con/wis/cha/int) are within the
331 * 1-30 stat limit. 248 * 1-30 stat limit.
332 */ 249 */
333
334void 250void
335check_stat_bounds (living *stats) 251check_stat_bounds (living *stats)
336{ 252{
337 int i, v;
338
339 for (i = 0; i < NUM_STATS; i++) 253 for (int i = 0; i < NUM_STATS; i++)
340 if ((v = get_attr_value (stats, i)) > MAX_STAT) 254 {
341 set_attr_value (stats, i, MAX_STAT); 255 sint8 &v = stats->stat (i);
342 else if (v < MIN_STAT) 256 v = clamp (v, MIN_STAT, MAX_STAT);
343 set_attr_value (stats, i, MIN_STAT); 257 }
344} 258}
345 259
346#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc) 260#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)
347 261
348/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, 262/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
349 * make this macro to clean those up. Not usuable outside change_abil 263 * make this macro to clean those up. Not usuable outside change_abil
350 * function since some of the values passed to new_draw_info are hardcoded. 264 * function since some of the values passed to new_draw_info are hardcoded.
351 */ 265 */
352#define DIFF_MSG(flag, msg1, msg2) \ 266#define DIFF_MSG(flag, msg1, msg2) \
353 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 267 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
354 268
355/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */ 269/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
356 270
357/* flag is set to 1 if we are applying the object, -1 if we are removing 271/* flag is set to 1 if we are applying the object, -1 if we are removing
358 * the object. 272 * the object.
359 * It is the calling functions responsibilty to check to see if the object 273 * It is the calling functions responsibilty to check to see if the object
360 * can be applied or not. 274 * can be applied or not.
361 * The main purpose of calling this function is the messages that are 275 * The main purpose of calling this function is the messages that are
362 * displayed - fix_player should really always be called after this when 276 * displayed - update_stats should really always be called after this when
363 * removing an object - that is because it is impossible to know if some object 277 * removing an object - that is because it is impossible to know if some object
364 * is the only source of an attacktype or spell attunement, so this function 278 * is the only source of an attacktype or spell attunement, so this function
365 * will clear the bits, but the player may still have some other object 279 * will clear the bits, but the player may still have some other object
366 * that gives them that ability. 280 * that gives them that ability.
367 */ 281 */
368int 282int
369change_abil (object *op, object *tmp) 283change_abil (object *op, object *tmp)
370{ 284{
371 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0; 285 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
286 int success = 0;
372 char message[MAX_BUF]; 287 char message[MAX_BUF];
373 int potion_max = 0; 288 int potion_max = 0;
374 289
375 /* remember what object was like before it was changed. note that 290 // keep some stats for comparison purposes
376 * refop is a local copy of op only to be used for detecting changes 291 object::flags_t prev_flag = op->flag;
377 * found by update_stats. refop is not a real object 292 MoveType prev_move_type = op->move_type;
378 */ 293 sint16 prev_resist [NROFATTACKS]; // clumsy
379 object_copy refop = *op; 294 assert (sizeof (prev_resist) == sizeof (op->resist));
295 memcpy (prev_resist, op->resist, sizeof (prev_resist));
380 296
381 if (op->type == PLAYER) 297 if (op->type == PLAYER)
382 { 298 {
383 if (tmp->type == POTION) 299 if (tmp->type == POTION)
384 { 300 {
385 potion_max = 1; 301 potion_max = 1;
302
386 for (j = 0; j < NUM_STATS; j++) 303 for (int j = 0; j < NUM_STATS; j++)
387 { 304 {
388 int nstat, ostat; 305 int ostat = op->contr->orig_stats.stat (j);
389 306 int i = tmp->stats.stat (j);
390 ostat = get_attr_value (&(op->contr->orig_stats), j);
391 i = get_attr_value (&(tmp->stats), j);
392 307
393 /* nstat is what the stat will be after use of the potion */ 308 /* nstat is what the stat will be after use of the potion */
394 nstat = flag * i + ostat; 309 int nstat = flag * i + ostat;
395 310
396 /* Do some bounds checking. While I don't think any 311 /* Do some bounds checking. There is the potential for potions
397 * potions do so right now, there is the potential for potions
398 * that adjust that stat by more than one point, so we need 312 * that adjust that stat by more than one point, so we need
399 * to allow for that. 313 * to allow for that.
400 */ 314 */
401 if (nstat < 1 && i * flag < 0) 315 if (nstat < 1 && i * flag < 0)
402 nstat = 1; 316 nstat = 1;
403 else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j)) 317 else if (nstat > 20 + op->arch->stats.stat (j))
404 { 318 nstat = 20 + op->arch->stats.stat (j);
405 nstat = 20 + get_attr_value (&(op->arch->clone.stats), j);
406 }
407 319
408 if (nstat != ostat) 320 if (nstat != ostat)
409 { 321 {
410 set_attr_value (&(op->contr->orig_stats), j, nstat); 322 op->contr->orig_stats.stat (j) = nstat;
411 potion_max = 0; 323 potion_max = 0;
412 } 324 }
413 else if (i) 325 else if (i)
414 { 326 {
415 /* potion is useless - player has already hit the natural maximum */ 327 /* potion is useless - player has already hit the natural maximum */
… …
419 331
420 /* This section of code ups the characters normal stats also. I am not 332 /* This section of code ups the characters normal stats also. I am not
421 * sure if this is strictly necessary, being that fix_player probably 333 * sure if this is strictly necessary, being that fix_player probably
422 * recalculates this anyway. 334 * recalculates this anyway.
423 */ 335 */
424 for (j = 0; j < NUM_STATS; j++) 336 for (int j = 0; j < NUM_STATS; j++)
425 change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j)); 337 change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
426 338
427 check_stat_bounds (&(op->stats)); 339 check_stat_bounds (&op->stats);
428 } /* end of potion handling code */ 340 } /* end of potion handling code */
429 } 341 }
430 342
431 /* reset attributes that fix_player doesn't reset since it doesn't search 343 /* reset attributes that update_stats doesn't reset since it doesn't search
432 * everything to set 344 * everything to set
433 */ 345 */
434 if (flag == -1) 346 if (flag == -1)
435 { 347 {
436 op->attacktype &= ~tmp->attacktype; 348 op->attacktype &= ~tmp->attacktype;
437 op->path_attuned &= ~tmp->path_attuned; 349 op->path_attuned &= ~tmp->path_attuned;
438 op->path_repelled &= ~tmp->path_repelled; 350 op->path_repelled &= ~tmp->path_repelled;
439 op->path_denied &= ~tmp->path_denied; 351 op->path_denied &= ~tmp->path_denied;
440 /* Presuming here that creatures only have move_type, 352 /* Presuming here that creatures only have move_type,
441 * and not the other move_ fields. 353 * and not the other move_ fields.
442 */ 354 */
443 op->move_type &= ~tmp->move_type; 355 op->move_type &= ~tmp->move_type;
444 } 356 }
445 357
446 /* call fix_player since op object could have whatever attribute due 358 /* call fix_player since op object could have whatever attribute due
447 * to multiple items. if fix_player always has to be called after 359 * to multiple items. if update_stats always has to be called after
448 * change_ability then might as well call it from here 360 * change_ability then might as well call it from here
449 */ 361 */
450 op->update_stats (); 362 op->update_stats ();
451 363
452 /* Fix player won't add the bows ability to the player, so don't 364 /* update_stats won't add the bows ability to the player, so don't
453 * print out message if this is a bow. 365 * print out message if this is a bow.
454 */ 366 */
455 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW) 367 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
456 { 368 {
457 success = 1; 369 success = 1;
458 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red."); 370 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
459 } 371 }
460 372
461 if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) 373 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
462 { 374 {
463 success = 1; 375 success = 1;
464 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore."); 376 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
465 } 377 }
466 378
467 if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE)) 379 if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
468 { 380 {
469 success = 1; 381 success = 1;
470 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away."); 382 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
471 } 383 }
472 384
473 if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL)) 385 if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
474 { 386 {
475 success = 1; 387 success = 1;
476 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow."); 388 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
477 } 389 }
478 390
… …
480 * user has multiple items giving the same type appled like we 392 * user has multiple items giving the same type appled like we
481 * used to - that is more work than what we gain, plus messages 393 * used to - that is more work than what we gain, plus messages
482 * can be misleading (a little higher could be miscontrued from 394 * can be misleading (a little higher could be miscontrued from
483 * from fly high) 395 * from fly high)
484 */ 396 */
485 if (tmp->move_type && op->move_type != refop.move_type) 397 if (tmp->move_type && op->move_type != prev_move_type)
486 { 398 {
487 success = 1; 399 success = 1;
488 400
489 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low 401 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
490 * status doesn't make a difference if you are flying high 402 * status doesn't make a difference if you are flying high
491 */ 403 */
492 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) 404 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
493 { 405 {
494 DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground."); 406 DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
495 } 407 }
496 408
497 if (tmp->move_type & MOVE_FLY_HIGH) 409 if (tmp->move_type & MOVE_FLY_HIGH)
498 { 410 {
499 /* double conditional - second case covers if you have move_fly_low - 411 /* double conditional - second case covers if you have move_fly_low -
500 * in that case, you don't actually land 412 * in that case, you don't actually land
501 */ 413 */
502 DIFF_MSG (flag, "You soar into the air air!.", 414 DIFF_MSG (flag, "You soar into the air!",
503 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); 415 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
504 } 416 }
417
505 if (tmp->move_type & MOVE_SWIM) 418 if (tmp->move_type & MOVE_SWIM)
506 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 419 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
507
508 /* Changing move status may mean you are affected by things you weren't before */
509 check_move_on (op, op);
510 } 420 }
511 421
512 /* becoming UNDEAD... a special treatment for this flag. Only those not 422 /* becoming UNDEAD... a special treatment for this flag. Only those not
513 * originally undead may change their status 423 * originally undead may change their status
514 */ 424 */
515 if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 425 if (!op->arch->flag [FLAG_UNDEAD])
516 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 426 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
517 { 427 {
518 success = 1; 428 success = 1;
519 if (flag > 0) 429 if (flag > 0)
520 { 430 {
521 op->race = "undead"; 431 op->race = "undead";
522 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!"); 432 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
523 } 433 }
524 else 434 else
525 { 435 {
526 op->race = op->arch->clone.race; 436 op->race = op->arch->race;
527 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 437 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
528 } 438 }
529 } 439 }
530 440
531 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 441 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
532 { 442 {
533 success = 1; 443 success = 1;
534 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 444 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
535 } 445 }
536 446
537 if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS)) 447 if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
538 { 448 {
539 success = 1; 449 success = 1;
540 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 450 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
541 } 451 }
542 452
543 /* blinded you can tell if more blinded since blinded player has minimal 453 /* blinded you can tell if more blinded since blinded player has minimal
544 * vision 454 * vision
545 */ 455 */
546 if (QUERY_FLAG (tmp, FLAG_BLIND)) 456 if (tmp->flag [FLAG_BLIND])
547 { 457 {
548 success = 1; 458 success = 1;
549 if (flag > 0) 459 if (flag > 0)
550 { 460 {
551 if (QUERY_FLAG (op, FLAG_WIZ)) 461 if (op->flag [FLAG_WIZ])
552 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); 462 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
553 else 463 else
554 { 464 {
555 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 465 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
556 SET_FLAG (op, FLAG_BLIND); 466 SET_FLAG (op, FLAG_BLIND);
… …
558 op->contr->do_los = 1; 468 op->contr->do_los = 1;
559 } 469 }
560 } 470 }
561 else 471 else
562 { 472 {
563 if (QUERY_FLAG (op, FLAG_WIZ)) 473 if (op->flag [FLAG_WIZ])
564 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); 474 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
565 else 475 else
566 { 476 {
567 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 477 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
568 CLEAR_FLAG (op, FLAG_BLIND); 478 CLEAR_FLAG (op, FLAG_BLIND);
… …
570 op->contr->do_los = 1; 480 op->contr->do_los = 1;
571 } 481 }
572 } 482 }
573 } 483 }
574 484
575 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK)) 485 if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
576 { 486 {
577 success = 1; 487 success = 1;
578 if (op->type == PLAYER) 488 if (op->type == PLAYER)
579 op->contr->do_los = 1; 489 op->contr->do_los = 1;
580 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark."); 490 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
581 } 491 }
582 492
583 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 493 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
584 { 494 {
585 success = 1; 495 success = 1;
586 if (flag > 0) 496 if (flag > 0)
587 { 497 {
588 if (QUERY_FLAG (op, FLAG_WIZ)) 498 if (op->flag [FLAG_WIZ])
589 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer."); 499 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
590 else 500 else
591 { 501 {
592 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 502 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
593 if (op->type == PLAYER) 503 if (op->type == PLAYER)
594 op->contr->do_los = 1; 504 op->contr->do_los = 1;
595 } 505 }
596 } 506 }
597 else 507 else
598 { 508 {
599 if (QUERY_FLAG (op, FLAG_WIZ)) 509 if (op->flag [FLAG_WIZ])
600 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus."); 510 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
601 else 511 else
602 { 512 {
603 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid."); 513 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
604 if (op->type == PLAYER) 514 if (op->type == PLAYER)
… …
637 success = 1; 547 success = 1;
638 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); 548 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
639 } 549 }
640 550
641 /* Messages for changed resistance */ 551 /* Messages for changed resistance */
642 for (i = 0; i < NROFATTACKS; i++) 552 for (int i = 0; i < NROFATTACKS; i++)
643 { 553 {
644 if (i == ATNR_PHYSICAL) 554 if (i == ATNR_PHYSICAL)
645 continue; /* Don't display about armour */ 555 continue; /* Don't display about armour */
646 556
647 if (op->resist[i] != refop.resist[i]) 557 if (op->resist [i] != prev_resist [i])
648 { 558 {
649 success = 1; 559 success = 1;
560
650 if (op->resist[i] > refop.resist[i]) 561 if (op->resist [i] > prev_resist [i])
651 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); 562 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
652 else 563 else
653 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); 564 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
654 565
655 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 566 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
656 } 567 }
657 } 568 }
658 569
659 if (!potion_max) 570 if (!potion_max)
660 {
661 for (j = 0; j < NUM_STATS; j++) 571 for (int j = 0; j < NUM_STATS; j++)
662 { 572 if (int i = tmp->stats.stat (j))
663 if ((i = get_attr_value (&(tmp->stats), j)) != 0)
664 { 573 {
665 success = 1; 574 success = 1;
666 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 575 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
667 } 576 }
668 }
669 }
670 577
671 return success; 578 return success;
672} 579}
673 580
674/* 581/*
675 * Stat draining by Vick 930307 582 * Stat draining by Vick 930307
676 * (Feeling evil, I made it work as well now. -Frank 8) 583 * (Feeling evil, I made it work as well now. -Frank 8)
677 */ 584 */
678
679void 585void
680object::drain_stat () 586object::drain_stat ()
681{ 587{
682 drain_specific_stat (rndm (NUM_STATS)); 588 drain_specific_stat (rndm (NUM_STATS));
683} 589}
… …
686object::drain_specific_stat (int deplete_stats) 592object::drain_specific_stat (int deplete_stats)
687{ 593{
688 object *tmp; 594 object *tmp;
689 archetype *at; 595 archetype *at;
690 596
691 at = archetype::find (ARCH_DEPLETION); 597 at = archetype::find (shstr_depletion);
692 if (!at) 598 if (!at)
693 { 599 {
694 LOG (llevError, "Couldn't find archetype depletion.\n"); 600 LOG (llevError, "Couldn't find archetype depletion.\n");
695 return; 601 return;
696 } 602 }
… …
698 { 604 {
699 tmp = present_arch_in_ob (at, this); 605 tmp = present_arch_in_ob (at, this);
700 606
701 if (!tmp) 607 if (!tmp)
702 { 608 {
703 tmp = arch_to_object (at); 609 tmp = at->instance ();
704 tmp = insert_ob_in_ob (tmp, this); 610 tmp = insert_ob_in_ob (tmp, this);
705 SET_FLAG (tmp, FLAG_APPLIED); 611 SET_FLAG (tmp, FLAG_APPLIED);
706 } 612 }
707 } 613 }
708 614
… …
716 * via an applied bad_luck object. 622 * via an applied bad_luck object.
717 */ 623 */
718void 624void
719object::change_luck (int value) 625object::change_luck (int value)
720{ 626{
721 archetype *at = archetype::find ("luck"); 627 archetype *at = archetype::find (shstr_luck);
722 if (!at) 628 if (!at)
723 LOG (llevError, "Couldn't find archetype luck.\n"); 629 LOG (llevError, "Couldn't find archetype luck.\n");
724 else 630 else
725 { 631 {
726 object *tmp = present_arch_in_ob (at, this); 632 object *tmp = present_arch_in_ob (at, this);
… …
728 if (!tmp) 634 if (!tmp)
729 { 635 {
730 if (!value) 636 if (!value)
731 return; 637 return;
732 638
733 tmp = arch_to_object (at); 639 tmp = at->instance ();
734 tmp = insert_ob_in_ob (tmp, this); 640 tmp = insert_ob_in_ob (tmp, this);
735 SET_FLAG (tmp, FLAG_APPLIED); 641 SET_FLAG (tmp, FLAG_APPLIED);
736 } 642 }
737 643
738 if (value) 644 if (value)
… …
772 * Subtracts stat-bonuses given by the class which the player has chosen. 678 * Subtracts stat-bonuses given by the class which the player has chosen.
773 */ 679 */
774void 680void
775object::remove_statbonus () 681object::remove_statbonus ()
776{ 682{
777 stats.Str -= arch->clone.stats.Str; 683 for (int i = 0; i < NUM_STATS; ++i)
778 stats.Dex -= arch->clone.stats.Dex; 684 {
779 stats.Con -= arch->clone.stats.Con; 685 sint8 v = arch->stats.stat (i);
780 stats.Wis -= arch->clone.stats.Wis; 686 stats.stat (i) -= v;
781 stats.Pow -= arch->clone.stats.Pow; 687 contr->orig_stats.stat (i) -= v;
782 stats.Cha -= arch->clone.stats.Cha; 688 }
783 stats.Int -= arch->clone.stats.Int;
784
785 contr->orig_stats.Str -= arch->clone.stats.Str;
786 contr->orig_stats.Dex -= arch->clone.stats.Dex;
787 contr->orig_stats.Con -= arch->clone.stats.Con;
788 contr->orig_stats.Wis -= arch->clone.stats.Wis;
789 contr->orig_stats.Pow -= arch->clone.stats.Pow;
790 contr->orig_stats.Cha -= arch->clone.stats.Cha;
791 contr->orig_stats.Int -= arch->clone.stats.Int;
792} 689}
793 690
794/* 691/*
795 * Adds stat-bonuses given by the class which the player has chosen. 692 * Adds stat-bonuses given by the class which the player has chosen.
796 */ 693 */
797void 694void
798object::add_statbonus () 695object::add_statbonus ()
799{ 696{
800 stats.Str += arch->clone.stats.Str; 697 for (int i = 0; i < NUM_STATS; ++i)
801 stats.Dex += arch->clone.stats.Dex; 698 {
802 stats.Con += arch->clone.stats.Con; 699 sint8 v = arch->stats.stat (i);
803 stats.Wis += arch->clone.stats.Wis; 700 stats.stat (i) += v;
804 stats.Pow += arch->clone.stats.Pow; 701 contr->orig_stats.stat (i) += v;
805 stats.Cha += arch->clone.stats.Cha; 702 }
806 stats.Int += arch->clone.stats.Int;
807
808 contr->orig_stats.Str += arch->clone.stats.Str;
809 contr->orig_stats.Dex += arch->clone.stats.Dex;
810 contr->orig_stats.Con += arch->clone.stats.Con;
811 contr->orig_stats.Wis += arch->clone.stats.Wis;
812 contr->orig_stats.Pow += arch->clone.stats.Pow;
813 contr->orig_stats.Cha += arch->clone.stats.Cha;
814 contr->orig_stats.Int += arch->clone.stats.Int;
815} 703}
704
705/* These are the items that currently can change digestion, regeneration,
706 * spell point recovery and mana point recovery. Seems sort of an arbitary
707 * list, but other items store other info into stats array.
708 */
709static struct digest_types : std::bitset<NUM_TYPES>
710{
711 digest_types ()
712 {
713 set (WEAPON);
714 set (BOW);
715 set (ARMOUR);
716 set (HELMET);
717 set (SHIELD);
718 set (RING);
719 set (BOOTS);
720 set (GLOVES);
721 set (AMULET);
722 set (GIRDLE);
723 set (BRACERS);
724 set (CLOAK);
725 set (DISEASE);
726 set (FORCE);
727 set (SKILL);
728 }
729} digest_types;
730
731static struct copy_flags : object::flags_t
732{
733 copy_flags ()
734 {
735 set (FLAG_LIFESAVE);
736 set (FLAG_REFL_SPELL);
737 set (FLAG_REFL_MISSILE);
738 set (FLAG_STEALTH);
739 set (FLAG_XRAYS);
740 set (FLAG_BLIND);
741 set (FLAG_SEE_IN_DARK);
742 }
743} copy_flags;
816 744
817/* 745/*
818 * Updates all abilities given by applied objects in the inventory 746 * Updates all abilities given by applied objects in the inventory
819 * of the given object. Note: This function works for both monsters 747 * of the given object. Note: This function works for both monsters
820 * and players; the "player" in the name is purely an archaic inheritance. 748 * and players; the "player" in the name is purely an archaic inheritance.
… …
825 * spell system split, grace points now added to system --peterm 753 * spell system split, grace points now added to system --peterm
826 */ 754 */
827void 755void
828object::update_stats () 756object::update_stats ()
829{ 757{
830 int i, j;
831 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; 758 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
832 int weapon_weight = 0, weapon_speed = 0; 759 int weapon_weight = 0, weapon_speed = 0;
833 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 760 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
834 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 761 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
835 object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; 762 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
836 float old_speed = speed; 763 float old_speed = speed;
764 int stat_sum [NUM_STATS];
765
766 MoveType move_type; // we use change_move_type to change it, so use a local copy
837 767
838 /* First task is to clear all the values back to their original values */ 768 /* First task is to clear all the values back to their original values */
839 if (type == PLAYER) 769 if (type == PLAYER)
840 { 770 {
771 contr->delayed_update = false;
772
841 for (i = 0; i < NUM_STATS; i++) 773 for (int i = 0; i < NUM_STATS; i++)
842 set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i)); 774 stat_sum [i] = contr->orig_stats.stat (i);
843 775
844 if (settings.spell_encumbrance == TRUE) 776 if (settings.spell_encumbrance == TRUE)
845 contr->encumbrance = 0; 777 contr->encumbrance = 0;
846 778
847 attacktype = 0; 779 attacktype = 0;
… …
852 contr->gen_grace = 0; 784 contr->gen_grace = 0;
853 contr->gen_sp_armour = 10; 785 contr->gen_sp_armour = 10;
854 contr->item_power = 0; 786 contr->item_power = 0;
855 } 787 }
856 788
857 memcpy (body_used, body_info, sizeof (body_info)); 789 for (int i = NUM_BODY_LOCATIONS; i--; )
790 slot[i].used = slot[i].info;
858 791
859 slaying = 0; 792 slaying = 0;
860 793
861 if (!QUERY_FLAG (this, FLAG_WIZ)) 794 if (!QUERY_FLAG (this, FLAG_WIZ))
862 { 795 {
… …
866 799
867 CLEAR_FLAG (this, FLAG_LIFESAVE); 800 CLEAR_FLAG (this, FLAG_LIFESAVE);
868 CLEAR_FLAG (this, FLAG_STEALTH); 801 CLEAR_FLAG (this, FLAG_STEALTH);
869 CLEAR_FLAG (this, FLAG_BLIND); 802 CLEAR_FLAG (this, FLAG_BLIND);
870 803
871 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 804 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
872 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 805 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
873 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 806 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
874 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 807 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
875 808
876 path_attuned = arch->clone.path_attuned; 809 path_attuned = arch->path_attuned;
877 path_repelled = arch->clone.path_repelled; 810 path_repelled = arch->path_repelled;
878 path_denied = arch->clone.path_denied; 811 path_denied = arch->path_denied;
879 glow_radius = arch->clone.glow_radius; 812 glow_radius = arch->glow_radius;
880 move_type = arch->clone.move_type; 813 move_type = arch->move_type;
881
882 chosen_skill = NULL;
883 814
884 /* initializing resistances from the values in player/monster's 815 /* initializing resistances from the values in player/monster's
885 * archetype clone 816 * archetype clone
886 */ 817 */
887 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 818 memcpy (&resist, &arch->resist, sizeof (resist));
888 819
889 for (i = 0; i < NROFATTACKS; i++) 820 for (int i = 0; i < NROFATTACKS; i++)
890 { 821 {
891 if (resist[i] > 0) 822 if (resist[i] > 0)
892 prot[i] = resist[i], vuln[i] = 0; 823 prot[i] = resist[i], vuln[i] = 0;
893 else 824 else
894 vuln[i] = -(resist[i]), prot[i] = 0; 825 vuln[i] = -resist[i], prot[i] = 0;
826
895 potion_resist[i] = 0; 827 potion_resist[i] = -1000;
896 } 828 }
897 829
898 wc = arch->clone.stats.wc; 830 wc = arch->stats.wc;
899 stats.dam = arch->clone.stats.dam; 831 stats.dam = arch->stats.dam;
900 832
901 /* for players which cannot use armour, they gain AC -1 per 3 levels, 833 /* for players which cannot use armour, they gain AC -1 per 3 levels,
902 * plus a small amount of physical resist, those poor suckers. ;) 834 * plus a small amount of physical resist, those poor suckers. ;)
903 * the fact that maxlevel is factored in could be considered sort of bogus - 835 * the fact that maxlevel is factored in could be considered sort of bogus -
904 * we should probably give them some bonus and cap it off - otherwise, 836 * we should probably give them some bonus and cap it off - otherwise,
905 * basically, if a server updates its max level, these playes may find 837 * basically, if a server updates its max level, these playes may find
906 * that their protection from physical goes down 838 * that their protection from physical goes down
907 */ 839 */
908 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 840 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
909 { 841 {
910 ac = MAX (-10, arch->clone.stats.ac - level / 3); 842 ac = max (-10, arch->stats.ac - level / 3);
911 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 843 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
912 } 844 }
913 else 845 else
914 ac = arch->clone.stats.ac; 846 ac = arch->stats.ac;
915 847
916 stats.luck = arch->clone.stats.luck; 848 stats.luck = arch->stats.luck;
917 speed = arch->clone.speed; 849 speed = arch->speed;
850
851 chosen_skill = 0;
918 852
919 /* OK - we've reset most all the objects attributes to sane values. 853 /* OK - we've reset most all the objects attributes to sane values.
920 * now go through and make adjustments for what the player has equipped. 854 * now go through and make adjustments for what the player has equipped.
921 */ 855 */
922 for (tmp = inv; tmp; tmp = tmp->below) 856 for (tmp = inv; tmp; tmp = tmp->below)
923 { 857 {
924 /* See note in map.c:update_position about making this additive
925 * since light sources are never applied, need to put check here.
926 */
927 if (tmp->glow_radius > glow_radius)
928 glow_radius = tmp->glow_radius;
929
930 /* This happens because apply_potion calls change_abil with the potion 858 /* This happens because apply_potion calls change_abil with the potion
931 * applied so we can tell the player what changed. But change_abil 859 * applied so we can tell the player what changed. But change_abil
932 * then calls this function. 860 * then calls this function.
933 */ 861 */
934 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
935 continue; 863 continue;
864
865 glow_radius += tmp->glow_radius;
936 866
937 /* For some things, we don't care what is equipped */ 867 /* For some things, we don't care what is equipped */
938 if (tmp->type == SKILL) 868 if (tmp->type == SKILL)
939 { 869 {
940 /* Want to take the highest skill here. */ 870 /* Want to take the highest skill here. */
… …
953 else if (tmp->level > grace_obj->level) 883 else if (tmp->level > grace_obj->level)
954 grace_obj = tmp; 884 grace_obj = tmp;
955 } 885 }
956 } 886 }
957 887
958 /* Container objects are not meant to adjust a players, but other applied 888 /* Container objects are not meant to adjust players, but other applied
959 * objects need to make adjustments. 889 * objects need to make adjustments.
960 * This block should handle all player specific changes 890 * This block should handle all player specific changes
961 * The check for Praying is a bit of a hack - god given bonuses are put 891 * The check for Praying is a bit of a hack - god given bonuses are put
962 * in the praying skill, and the player should always get those. 892 * in the praying skill, and the player should always get those.
963 * It also means we need to put in additional checks for applied below, 893 * It also means we need to put in additional checks for applied below,
964 * because the skill shouldn't count against body positions being used 894 * because the skill shouldn't count against body positions being used
965 * up, etc. 895 * up, etc.
966 */ 896 */
967 if ((QUERY_FLAG (tmp, FLAG_APPLIED) 897 if ((tmp->flag [FLAG_APPLIED]
968 && tmp->type != CONTAINER 898 && tmp->type != CONTAINER
969 && tmp->type != CLOSE_CON) 899 && tmp->type != CLOSE_CON)
970 || (tmp->type == SKILL
971 && tmp->subtype == SK_PRAYING)) 900 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
972 { 901 {
973 if (type == PLAYER) 902 if (type == PLAYER)
974 { 903 {
904 contr->item_power += tmp->item_power;
905
975 for (i = 0; i < NUM_STATS; i++) 906 for (int i = 0; i < NUM_STATS; i++)
976 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i)); 907 stat_sum [i] += tmp->stats.stat (i);
977 908
978 /* these are the items that currently can change digestion, regeneration, 909 if (digest_types [tmp->type])
979 * spell point recovery and mana point recovery. Seems sort of an arbitary
980 * list, but other items store other info into stats array.
981 */
982 if ((tmp->type == WEAPON) || (tmp->type == BOW) ||
983 (tmp->type == ARMOUR) || (tmp->type == HELMET) ||
984 (tmp->type == SHIELD) || (tmp->type == RING) ||
985 (tmp->type == BOOTS) || (tmp->type == GLOVES) ||
986 (tmp->type == AMULET) || (tmp->type == GIRDLE) ||
987 (tmp->type == BRACERS) || (tmp->type == CLOAK) ||
988 (tmp->type == DISEASE) || (tmp->type == FORCE) ||
989 (tmp->type == SKILL))
990 { 910 {
991 contr->digestion += tmp->stats.food; 911 contr->digestion += tmp->stats.food;
992 contr->gen_hp += tmp->stats.hp; 912 contr->gen_hp += tmp->stats.hp;
913 if (tmp->type != BOW) // ugly exception for bows
993 contr->gen_sp += tmp->stats.sp; 914 contr->gen_sp += tmp->stats.sp;
994 contr->gen_grace += tmp->stats.grace; 915 contr->gen_grace += tmp->stats.grace;
995 contr->gen_sp_armour += tmp->gen_sp_armour; 916 contr->gen_sp_armour += tmp->gen_sp_armour;
996 contr->item_power += tmp->item_power;
997 } 917 }
998 } /* if this is a player */ 918 } /* if this is a player */
919 else
920 {
921 if (tmp->type == WEAPON)
922 current_weapon = tmp;
923 }
999 924
1000 /* Update slots used for items */ 925 /* Update slots used for items */
1001 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 926 if (tmp->flag [FLAG_APPLIED]) // exclude praying...
1002 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 927 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1003 body_used[i] += tmp->body_info[i]; 928 slot[i].used += tmp->slot[i].info;
1004 929
1005 if (tmp->type == SYMPTOM) 930 if (tmp->type == SYMPTOM)
1006 {
1007 speed_reduce_from_disease = tmp->last_sp / 100.f; 931 min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
1008 932
1009 if (speed_reduce_from_disease == 0)
1010 speed_reduce_from_disease = 1;
1011 }
1012
1013 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 933 /* Pos. and neg. protections are counted separate (-> pro/vuln).
1014 * (Negative protections are calculated exactly like positive.) 934 * (Negative protections are calculated exactly like positive.)
1015 * Resistance from potions are treated special as well. If there's 935 * Resistance from potions are treated special as well. If there's
1016 * more than one potion-effect, the bigger prot.-value is taken. 936 * more than one potion-effect, the bigger prot.-value is taken.
1017 */ 937 */
938 if (tmp->type == POTION_EFFECT)
939 for (int i = 0; i < NROFATTACKS; i++)
940 max_it (potion_resist[i], tmp->resist[i]);
1018 if (tmp->type != POTION) 941 else if (tmp->type != POTION)
942 for (int i = 0; i < NROFATTACKS; i++)
943 if (tmp->resist[i] > 0)
944 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
945 else if (tmp->resist[i] < 0)
946 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
947
948 /* There may be other things that should not adjust the attacktype */
949 if (tmp->type != SYMPTOM)
1019 { 950 {
1020 for (i = 0; i < NROFATTACKS; i++) 951 attacktype |= tmp->attacktype;
1021 { 952 path_attuned |= tmp->path_attuned;
1022 /* Potential for cursed potions, in which case we just can use 953 path_repelled |= tmp->path_repelled;
1023 * a straight MAX, as potion_resist is initialised to zero. 954 path_denied |= tmp->path_denied;
1024 */ 955 move_type |= tmp->move_type;
1025 if (tmp->type == POTION_EFFECT) 956 stats.luck += tmp->stats.luck;
1026 {
1027 if (potion_resist[i])
1028 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
1029 else
1030 potion_resist[i] = tmp->resist[i];
1031 }
1032 else if (tmp->resist[i] > 0)
1033 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
1034 else if (tmp->resist[i] < 0)
1035 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1036 }
1037 } 957 }
1038 958
1039 /* There may be other things that should not adjust the attacktype */ 959 flag |= tmp->flag & copy_flags;
1040 if (tmp->type != BOW && tmp->type != SYMPTOM)
1041 attacktype |= tmp->attacktype;
1042 960
1043 path_attuned |= tmp->path_attuned;
1044 path_repelled |= tmp->path_repelled;
1045 path_denied |= tmp->path_denied;
1046 move_type |= tmp->move_type;
1047 stats.luck += tmp->stats.luck;
1048
1049 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1050 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1051 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1052 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1053 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1054 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1055 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1056
1057 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) 961 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
1058 SET_FLAG (this, FLAG_UNDEAD); 962 SET_FLAG (this, FLAG_UNDEAD);
1059 963
964 //TODO: copy_flags?
1060 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 965 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1061 { 966 {
1062 SET_FLAG (this, FLAG_MAKE_INVIS); 967 SET_FLAG (this, FLAG_MAKE_INVIS);
1063 invisible = 1; 968 invisible = 1;
1064 } 969 }
… …
1074 added_speed += tmp->stats.exp; 979 added_speed += tmp->stats.exp;
1075 } 980 }
1076 981
1077 switch (tmp->type) 982 switch (tmp->type)
1078 { 983 {
1079 case WAND:
1080 case ROD:
1081 case HORN:
1082 if (type == PLAYER)
1083 {
1084 contr->ranged_skill = this;
1085 contr->ranged_ob = tmp;
1086 }
1087 break;
1088
1089 /* skills modifying the character -b.t. */
1090 /* for all skills and skill granting objects */
1091 case SKILL: 984 case SKILL:
1092 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 985 {
986 // some skills will end up here without counting as "applied"
987 if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK)
1093 break; 988 break;
1094 989
1095 if (IS_COMBAT_SKILL (tmp->subtype))
1096 wc_obj = tmp;
1097
1098 if (chosen_skill) 990 if (chosen_skill)
991 {
1099 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 992 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
993 &name, &chosen_skill->name, &tmp->name);
1100 994
995 tmp->flag [FLAG_APPLIED] = false;
996 update_stats ();
997 return;
998 }
999
1101 chosen_skill = tmp; 1000 chosen_skill = tmp;
1102 1001
1103 if (tmp->stats.dam > 0) 1002 if (tmp->stats.dam > 0)
1104 { /* skill is a 'weapon' */ 1003 { /* skill is a 'weapon' */
1105 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1004 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1106 weapon_speed = WEAPON_SPEED (tmp); 1005 weapon_speed = max (0, WEAPON_SPEED (tmp));
1107 1006
1108 if (weapon_speed < 0)
1109 weapon_speed = 0;
1110
1111 weapon_weight = tmp->weight; 1007 weapon_weight = tmp->weight;
1112 stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9)); 1008 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1113 1009
1114 if (tmp->magic) 1010 if (tmp->magic)
1115 stats.dam += tmp->magic; 1011 stats.dam += tmp->magic;
1116 } 1012 }
1117 1013
1118 if (tmp->stats.wc) 1014 if (tmp->stats.wc)
1119 wc -= tmp->stats.wc + tmp->magic; 1015 wc -= tmp->stats.wc + tmp->magic;
1120 1016
1121 if (tmp->slaying) 1017 if (tmp->slaying)
1122 slaying = tmp->slaying; 1018 slaying = tmp->slaying;
1123 1019
1124 if (tmp->stats.ac) 1020 if (tmp->stats.ac)
1125 ac -= tmp->stats.ac + tmp->magic; 1021 ac -= tmp->stats.ac + tmp->magic;
1126 1022
1127 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1023 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1128 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1024 contr->encumbrance += 3 * tmp->weight / 1000;
1129
1130 if (type == PLAYER)
1131 {
1132 contr->ranged_skill = this;
1133 contr->ranged_ob = tmp;
1134 } 1025 }
1135 1026
1136 break;
1137
1138 case SKILL_TOOL:
1139 if (chosen_skill)
1140 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1141
1142 chosen_skill = tmp;
1143
1144 if (type == PLAYER)
1145 {
1146 contr->ranged_skill = this;
1147 contr->ranged_ob = tmp;
1148 }
1149 break; 1027 break;
1150 1028
1151 case SHIELD: 1029 case SHIELD:
1152 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1030 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1153 contr->encumbrance += (int) tmp->weight / 2000; 1031 contr->encumbrance += tmp->weight / 2000;
1032 //FALLTHROUGH
1154 case RING: 1033 case RING:
1155 case AMULET: 1034 case AMULET:
1156 case GIRDLE: 1035 case GIRDLE:
1157 case HELMET: 1036 case HELMET:
1158 case BOOTS: 1037 case BOOTS:
… …
1167 if (tmp->stats.ac) 1046 if (tmp->stats.ac)
1168 ac -= tmp->stats.ac + tmp->magic; 1047 ac -= tmp->stats.ac + tmp->magic;
1169 1048
1170 break; 1049 break;
1171 1050
1051 case WAND:
1052 case ROD:
1053 case HORN:
1054 break;
1055
1172 case BOW: 1056 case BOW:
1173 case WEAPON: 1057 case WEAPON:
1174 if (type != PLAYER
1175 || (contr->combat_skill && contr->combat_skill->type == SKILL && (skill_flags [contr->combat_skill->subtype] & SF_NEED_BOW ) && tmp->type == BOW )
1176 || (contr->combat_skill && contr->combat_skill->type == SKILL && (skill_flags [contr->combat_skill->subtype] & SF_NEED_WEAPON) && tmp->type == WEAPON))
1177 {
1178 wc -= tmp->stats.wc + tmp->magic; 1058 wc -= tmp->stats.wc + tmp->magic;
1179 1059
1180 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1060 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1181 ac -= tmp->stats.ac + tmp->magic; 1061 ac -= tmp->stats.ac + tmp->magic;
1182 1062
1183 stats.dam += tmp->stats.dam + tmp->magic; 1063 stats.dam += tmp->stats.dam + tmp->magic;
1184 weapon_weight = tmp->weight; 1064 weapon_weight = tmp->weight;
1185 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1065 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1186 1066
1187 if (weapon_speed < 0) 1067 if (weapon_speed < 0)
1188 weapon_speed = 0; 1068 weapon_speed = 0;
1189 1069
1190 slaying = tmp->slaying; 1070 slaying = tmp->slaying;
1191 1071
1192 /* If there is desire that two handed weapons should do 1072 /* If there is desire that two handed weapons should do
1193 * extra strength damage, this is where the code should 1073 * extra strength damage, this is where the code should
1194 * go. 1074 * go.
1195 */ 1075 */
1196 1076
1197 current_weapon = tmp;
1198
1199 if (type == PLAYER) 1077 if (type == PLAYER)
1200 {
1201 contr->combat_ob = tmp;
1202
1203 if (settings.spell_encumbrance) 1078 if (settings.spell_encumbrance)
1204 contr->encumbrance += tmp->weight * 3 / 1000; 1079 contr->encumbrance += tmp->weight * 3 / 1000;
1205 }
1206 }
1207 1080
1208 break; 1081 break;
1209 1082
1210 case ARMOUR: /* Only the best of these three are used: */ 1083 case ARMOUR: /* Only the best of these three are used: */
1211 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1084 if (settings.spell_encumbrance == TRUE && type == PLAYER)
… …
1234 else /* To nullify the below effect */ 1107 else /* To nullify the below effect */
1235 ac += tmp->stats.ac + tmp->magic; 1108 ac += tmp->stats.ac + tmp->magic;
1236 } 1109 }
1237 1110
1238 if (tmp->stats.wc) 1111 if (tmp->stats.wc)
1239 wc -= (tmp->stats.wc + tmp->magic); 1112 wc -= tmp->stats.wc + tmp->magic;
1240 1113
1241 if (tmp->stats.ac) 1114 if (tmp->stats.ac)
1242 ac -= (tmp->stats.ac + tmp->magic); 1115 ac -= tmp->stats.ac + tmp->magic;
1243 1116
1244 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max) 1117 if (ARMOUR_SPEED (tmp))
1245 max = ARMOUR_SPEED (tmp) / 10.f; 1118 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1246 1119
1247 break; 1120 break;
1248 } /* switch tmp->type */ 1121 } /* switch tmp->type */
1249 } /* item is equipped */ 1122 } /* item is equipped */
1250 } /* for loop of items */ 1123 } /* for loop of items */
1124
1125 min_it (glow_radius, MAX_LIGHT_RADIUS);
1251 1126
1252 /* We've gone through all the objects the player has equipped. For many things, we 1127 /* We've gone through all the objects the player has equipped. For many things, we
1253 * have generated intermediate values which we now need to assign. 1128 * have generated intermediate values which we now need to assign.
1254 */ 1129 */
1255 1130
… …
1257 * If there is an uncursed potion in effect, granting more protection 1132 * If there is an uncursed potion in effect, granting more protection
1258 * than that, we take: 'total resistance = resistance from potion'. 1133 * than that, we take: 'total resistance = resistance from potion'.
1259 * If there is a cursed (and no uncursed) potion in effect, we take 1134 * If there is a cursed (and no uncursed) potion in effect, we take
1260 * 'total resistance = vulnerability from cursed potion'. 1135 * 'total resistance = vulnerability from cursed potion'.
1261 */ 1136 */
1262 for (i = 0; i < NROFATTACKS; i++) 1137 for (int i = 0; i < NROFATTACKS; i++)
1263 { 1138 {
1264 resist[i] = prot[i] - vuln[i]; 1139 resist[i] = prot[i] - vuln[i];
1265 1140
1266 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1141 if (potion_resist[i] != -1000
1142 && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1267 resist[i] = potion_resist[i]; 1143 resist[i] = potion_resist[i];
1268 } 1144 }
1269 1145
1270 /* Figure out the players sp/mana/hp totals. */
1271 if (type == PLAYER) 1146 if (type == PLAYER)
1272 { 1147 {
1148 // clamp various player stats
1149 for (int i = 0; i < NUM_STATS; ++i)
1150 stats.stat (i) = stat_sum [i];
1151
1152 check_stat_bounds (&stats);
1153
1154 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1155
1156 /* Figure out the players sp/mana/hp totals. */
1273 int pl_level; 1157 int pl_level;
1274 1158
1275 check_stat_bounds (&(stats));
1276 pl_level = level;
1277
1278 if (pl_level < 1)
1279 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1159 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1280 1160
1281 /* You basically get half a con bonus/level. But we do take into account rounding, 1161 /* You basically get half a con bonus/level. But we do take into account rounding,
1282 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1162 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1283 */ 1163 */
1284 for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) 1164 stats.maxhp = 0;
1165 for (int i = 1; i <= min (10, pl_level); i++)
1285 { 1166 {
1286 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1167 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1287 1168
1288 if (i % 2 && con_bonus[stats.Con] % 2) 1169 if (i % 2 && con_bonus[stats.Con] % 2)
1289 {
1290 if (con_bonus[stats.Con] > 0) 1170 if (con_bonus[stats.Con] > 0)
1291 j++; 1171 j++;
1292 else 1172 else
1293 j--; 1173 j--;
1294 }
1295 1174
1296 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ 1175 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1297 } 1176 }
1298 1177
1299 for (i = 11; i <= level; i++) 1178 stats.maxhp += 2 * max (0, level - 10);
1300 stats.maxhp += 2;
1301 1179
1302 if (stats.hp > stats.maxhp) 1180 if (stats.hp > stats.maxhp)
1303 stats.hp = stats.maxhp; 1181 stats.hp = stats.maxhp;
1304 1182
1305 /* Sp gain is controlled by the level of the player's 1183 /* Sp gain is controlled by the level of the player's
… …
1318 1196
1319 if (mana_obj == this && type == PLAYER) 1197 if (mana_obj == this && type == PLAYER)
1320 stats.maxsp = 1; 1198 stats.maxsp = 1;
1321 else 1199 else
1322 { 1200 {
1323 sp_tmp = 0.f; 1201 float sp_tmp = 0.f;
1324 1202
1325 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1203 for (int i = 1; i <= min (10, mana_obj->level); i++)
1326 { 1204 {
1327 float stmp; 1205 float stmp;
1328 1206
1329 /* Got some extra bonus at first level */ 1207 /* Got some extra bonus at first level */
1330 if (i < 2) 1208 if (i < 2)
1331 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f; 1209 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1332 else 1210 else
1333 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; 1211 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1334 1212
1335 if (stmp < 1.f)
1336 stmp = 1.f;
1337
1338 sp_tmp += stmp; 1213 sp_tmp += max (1.f, stmp);
1339 } 1214 }
1340 1215
1341 stats.maxsp = (sint16)sp_tmp; 1216 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1342
1343 for (i = 11; i <= mana_obj->level; i++)
1344 stats.maxsp += 2;
1345 } 1217 }
1218
1346 /* Characters can get their sp supercharged via rune of transferrance */ 1219 /* Characters can get their sp supercharged via rune of transferrance */
1347 if (stats.sp > stats.maxsp * 2) 1220 stats.sp = min (stats.sp, stats.maxsp * 2);
1348 stats.sp = stats.maxsp * 2;
1349 1221
1350 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ 1222 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1351 if (!grace_obj || !grace_obj->level || type != PLAYER) 1223 if (!grace_obj || !grace_obj->level || type != PLAYER)
1352 grace_obj = this; 1224 grace_obj = this;
1353 1225
… …
1358 /* store grace in a float - this way, the divisions below don't create 1230 /* store grace in a float - this way, the divisions below don't create
1359 * big jumps when you go from level to level - with int's, it then 1231 * big jumps when you go from level to level - with int's, it then
1360 * becomes big jumps when the sums of the bonuses jump to the next 1232 * becomes big jumps when the sums of the bonuses jump to the next
1361 * step of 8 - with floats, even fractional ones are useful. 1233 * step of 8 - with floats, even fractional ones are useful.
1362 */ 1234 */
1363 sp_tmp = 0.f; 1235 float sp_tmp = 0.f;
1364 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1236
1237 for (int i = 1; i <= min (10, grace_obj->level); i++)
1365 { 1238 {
1366 float grace_tmp = 0.f; 1239 float grace_tmp = 0.f;
1367 1240
1368 /* Got some extra bonus at first level */ 1241 /* Got some extra bonus at first level */
1369 if (i < 2) 1242 if (i < 2)
1370 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f; 1243 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1371 else 1244 else
1372 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; 1245 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1373 1246
1374 if (grace_tmp < 1.f)
1375 grace_tmp = 1.f;
1376
1377 sp_tmp += grace_tmp; 1247 sp_tmp += max (1.f, grace_tmp);
1378 } 1248 }
1379 1249
1380 stats.maxgrace = (sint16)sp_tmp;
1381
1382 /* two grace points per level after 11 */ 1250 /* two grace points per level after 10 */
1383 for (i = 11; i <= grace_obj->level; i++) 1251 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1384 stats.maxgrace += 2;
1385 } 1252 }
1253
1386 /* No limit on grace vs maxgrace */ 1254 /* No limit on grace vs maxgrace */
1387 1255
1388 if (contr->braced) 1256 if (contr->braced)
1389 { 1257 {
1390 ac += 2; 1258 ac += 2;
… …
1402 * improvement every level, now its fighterlevel/5. So 1270 * improvement every level, now its fighterlevel/5. So
1403 * we give the player a bonus here in wc and dam 1271 * we give the player a bonus here in wc and dam
1404 * to make up for the change. Note that I left the 1272 * to make up for the change. Note that I left the
1405 * monster bonus the same as before. -b.t. 1273 * monster bonus the same as before. -b.t.
1406 */ 1274 */
1275 object *wc_obj = chosen_skill;
1407 1276
1408 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1277 if (contr && wc_obj && wc_obj->level > 1)
1409 { 1278 {
1410 wc -= wc_obj->level + thaco_bonus[stats.Str]; 1279 wc -= wc_obj->level + thaco_bonus[stats.Str];
1411 1280
1412 for (i = 1; i < wc_obj->level; i++) 1281 for (int i = 1; i < wc_obj->level; i++)
1413 { 1282 {
1414 /* addtional wc every 6 levels */ 1283 /* additional wc every 6 levels */
1415 if (!(i % 6)) 1284 if (!(i % 6))
1416 wc--; 1285 wc--;
1417 1286
1418 /* addtional dam every 4 levels. */ 1287 /* additional dam every 4 levels. */
1419 if (!(i % 4) && dam_bonus[stats.Str] >= 0) 1288 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1420 stats.dam += 1 + dam_bonus[stats.Str] / 5; 1289 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1421 } 1290 }
1422 } 1291 }
1423 else 1292 else
… …
1430 1299
1431 speed = 1.f + speed_bonus[stats.Dex]; 1300 speed = 1.f + speed_bonus[stats.Dex];
1432 1301
1433 if (settings.search_items && contr->search_str[0]) 1302 if (settings.search_items && contr->search_str[0])
1434 speed -= 1; 1303 speed -= 1;
1435
1436 if (attacktype == 0)
1437 attacktype = arch->clone.attacktype;
1438
1439 } /* End if player */ 1304 } /* End if player */
1440 1305
1441 if (added_speed >= 0) 1306 if (added_speed >= 0)
1442 speed += added_speed / 10.f; 1307 speed += added_speed / 10.f;
1443 else /* Something wrong here...: */ 1308 else /* Something wrong here...: */
1444 speed /= 1.f - added_speed; 1309 speed /= 1.f - added_speed;
1445 1310
1446 /* Max is determined by armour */ 1311 /* Max is determined by armour */
1447 if (speed > max) 1312 speed = min (speed, max_speed);
1448 speed = max;
1449 1313
1450 if (type == PLAYER) 1314 if (type == PLAYER)
1451 { 1315 {
1452 /* f is a number the represents the number of kg above (positive num) 1316 /* f is a number the represents the number of kg above (positive num)
1453 * or below (negative number) that the player is carrying. If above 1317 * or below (negative number) that the player is carrying. If above
1454 * weight limit, then player suffers a speed reduction based on how 1318 * weight limit, then player suffers a speed reduction based on how
1455 * much above he is, and what is max carry is 1319 * much above he is, and what is max carry is
1456 */ 1320 */
1457 f = (carrying / 1000) - max_carry[stats.Str]; 1321 float f = (carrying / 1000) - max_carry[stats.Str];
1458 if (f > 0) 1322 if (f > 0.f)
1459 speed = speed / (1.f + f / max_carry[stats.Str]); 1323 speed = speed / (1.f + f / max_carry[stats.Str]);
1460 } 1324 }
1461 1325
1462 speed += bonus_speed / 10.f; /* Not affected by limits */ 1326 speed += bonus_speed / 10.f; /* Not affected by limits */
1327 speed *= speed_reduce_from_disease;
1463 1328
1464 /* Put a lower limit on speed. Note with this speed, you move once every 1329 /* Put a lower limit on speed. Note with this speed, you move once every
1465 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1330 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1466 */ 1331 */
1467 speed = speed * speed_reduce_from_disease; 1332 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1468 1333
1469 if (speed < 0.01f && type == PLAYER) 1334 if (speed != old_speed)
1470 speed = 0.01f; 1335 set_speed (speed);
1471 1336
1472 if (type == PLAYER) 1337 if (type == PLAYER)
1473 { 1338 {
1474 /* (This formula was made by vidarl@ifi.uio.no) 1339 /* (This formula was made by vidarl@ifi.uio.no)
1475 * Note that we never used these values again - basically 1340 * Note that we never used these values again - basically
… …
1477 * that would just be a real pain to read. 1342 * that would just be a real pain to read.
1478 */ 1343 */
1479 float M = (max_carry[stats.Str] - 121) / 121.f; 1344 float M = (max_carry[stats.Str] - 121) / 121.f;
1480 float M2 = max_carry[stats.Str] / 100.f; 1345 float M2 = max_carry[stats.Str] / 100.f;
1481 float W = weapon_weight / 20000.f; 1346 float W = weapon_weight / 20000.f;
1482 float s = 2 - weapon_speed / 10.f; 1347 float s = (20 - weapon_speed) / 10.f;
1483 float D = (stats.Dex - 14) / 14.f; 1348 float D = (stats.Dex - 14) / 14.f;
1484 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f; 1349 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1485 1350
1486 K *= (4 + level) *1.2f / (6 + level); 1351 K *= (4 + level) * 1.2f / (6 + level);
1487 1352
1488 if (K <= 0.f) 1353 if (K <= 0.01f)
1489 K = 0.01f; 1354 K = 0.01f;
1490 1355
1491 float S = speed / (K * s); 1356 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1492
1493 contr->weapon_sp = S;
1494 } 1357 }
1495 1358
1496 /* I want to limit the power of small monsters with big weapons: */ 1359 /* I want to limit the power of small monsters with big weapons: */
1497 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) 1360 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1498 stats.dam = arch->clone.stats.dam * 3; 1361 stats.dam = arch->stats.dam * 3;
1499 1362
1500 /* Prevent overflows of wc - best you can get is ABS(120) - this 1363 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1501 * should be more than enough - remember, AC is also in 8 bits, 1364 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1502 * so its value is the same.
1503 */
1504 if (wc > 120)
1505 wc = 120;
1506 else if (wc < -120)
1507 wc = -120;
1508
1509 stats.wc = wc;
1510
1511 if (ac > 120)
1512 ac = 120;
1513 else if (ac < -120)
1514 ac = -120;
1515
1516 stats.ac = ac;
1517 1365
1518 /* if for some reason the creature doesn't have any move type, 1366 /* if for some reason the creature doesn't have any move type,
1519 * give them walking as a default. 1367 * give them walking as a default.
1520 * The second case is a special case - to more closely mimic the 1368 * The second case is a special case - to more closely mimic the
1521 * old behaviour - if your flying, your not walking - just 1369 * old behaviour - if your flying, your not walking - just
… …
1524 if (move_type == 0) 1372 if (move_type == 0)
1525 move_type = MOVE_WALK; 1373 move_type = MOVE_WALK;
1526 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1374 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1527 move_type &= ~MOVE_WALK; 1375 move_type &= ~MOVE_WALK;
1528 1376
1529 if (speed != old_speed) 1377 // now apply the new move_type
1530 set_speed (speed); 1378 if (this->move_type != move_type)
1379 change_move_type (move_type);
1531 1380
1532 /* It is quite possible that a player's spell costing might have changed, 1381 /* It is quite possible that a player's spell costing might have changed,
1533 * so we will check that now. 1382 * so we will check that now.
1534 */ 1383 */
1535 if (type == PLAYER) 1384 if (is_player ())
1536 { 1385 contr->update_spells ();
1537 esrv_update_stats (contr);
1538 esrv_update_spells (contr);
1539 }
1540 1386
1541 // update the mapspace, if we are on a map 1387 // update the mapspace, if we are on a map
1542 if (!flag [FLAG_REMOVED] && map) 1388 if (!flag [FLAG_REMOVED] && map)
1543 map->at (x, y).flags_ = 0; 1389 map->at (x, y).flags_ = 0;
1390}
1391
1392void
1393object::set_glow_radius (sint8 rad)
1394{
1395 glow_radius = rad;
1396
1397 if (is_on_map ())
1398 update_all_los (map, x, y);
1399 else if (object *env = outer_env ())
1400 {
1401 env->update_stats ();
1402
1403 if (env->is_on_map ())
1404 update_all_los (env->map, env->x, env->y);
1405 }
1544} 1406}
1545 1407
1546/* 1408/*
1547 * Returns true if the given player is a legal class. 1409 * Returns true if the given player is a legal class.
1548 * The function to add and remove class-bonuses to the stats doesn't 1410 * The function to add and remove class-bonuses to the stats doesn't
… …
1564 1426
1565/* 1427/*
1566 * set the new dragon name after gaining levels or 1428 * set the new dragon name after gaining levels or
1567 * changing ability focus (later this can be extended to 1429 * changing ability focus (later this can be extended to
1568 * eventually change the player's face and animation) 1430 * eventually change the player's face and animation)
1569 *
1570 * Note that the title is written to 'own_title' in the
1571 * player struct. This should be changed to 'ext_title'
1572 * as soon as clients support this!
1573 * Please, anyone, write support for 'ext_title'.
1574 */ 1431 */
1575void 1432void
1576set_dragon_name (object *pl, const object *abil, const object *skin) 1433set_dragon_name (object *pl, const object *abil, const object *skin)
1577{ 1434{
1578 int atnr = -1; /* attacknumber of highest level */ 1435 int atnr = -1; /* attacknumber of highest level */
… …
1596 /* now if there are equals at highest level, pick the one with focus, 1453 /* now if there are equals at highest level, pick the one with focus,
1597 or else at random */ 1454 or else at random */
1598 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1455 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1599 atnr = abil->stats.exp; 1456 atnr = abil->stats.exp;
1600 1457
1601 level = (int) (level / 5.);
1602
1603 /* now set the new title */ 1458 /* now set the new title */
1604 if (pl->contr != NULL)
1605 {
1606 if (level == 0)
1607 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1459 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1608 else if (level == 1)
1609 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1460 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1610 else if (level == 2)
1611 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1461 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1612 else if (level == 3)
1613 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1462 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1614 else 1463 else
1615 { 1464 {
1616 /* special titles for extra high resistance! */ 1465 /* special titles for extra high resistance! */
1617 if (skin->resist[atnr] > 80)
1618 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1466 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1619 else if (skin->resist[atnr] > 50)
1620 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1467 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1621 else
1622 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1468 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1623 }
1624 } 1469 }
1625 1470
1626 strcpy (pl->contr->own_title, ""); 1471 strcpy (pl->contr->own_title, "");
1627} 1472}
1628 1473
1629/* 1474/*
1630 * This function is called when a dragon-player gains 1475 * This function is called when a dragon-player gains
1631 * an overall level. Here, the dragon might gain new abilities 1476 * an overall level. Here, the dragon might gain new abilities
1632 * or change the ability-focus. 1477 * or change the ability-focus.
1633 */ 1478 */
1634void 1479static void
1635dragon_level_gain (object *who) 1480dragon_level_gain (object *who)
1636{ 1481{
1637 object *abil = NULL; /* pointer to dragon ability force */ 1482 object *abil = NULL; /* pointer to dragon ability force */
1638 object *skin = NULL; /* pointer to dragon skin force */ 1483 object *skin = NULL; /* pointer to dragon skin force */
1639 object *tmp = NULL; /* tmp. object */ 1484 object *tmp = NULL; /* tmp. object */
1640 char buf[MAX_BUF]; /* tmp. string buffer */ 1485 char buf[MAX_BUF]; /* tmp. string buffer */
1641 1486
1642 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1487 /* now grab the 'dragon_ability'-forces from the player's inventory */
1643 shstr_cmp dragon_ability_force ("dragon_ability_force");
1644 shstr_cmp dragon_skin_force ("dragon_skin_force");
1645
1646 for (tmp = who->inv; tmp; tmp = tmp->below) 1488 for (tmp = who->inv; tmp; tmp = tmp->below)
1647 if (tmp->type == FORCE) 1489 if (tmp->type == FORCE)
1648 if (tmp->arch->name == dragon_ability_force) 1490 if (tmp->arch->archname == shstr_dragon_ability_force)
1649 abil = tmp; 1491 abil = tmp;
1650 else if (tmp->arch->name == dragon_skin_force) 1492 else if (tmp->arch->archname == shstr_dragon_skin_force)
1651 skin = tmp; 1493 skin = tmp;
1652 1494
1653 /* if the force is missing -> bail out */ 1495 /* if the force is missing -> bail out */
1654 if (abil == NULL) 1496 if (abil == NULL)
1655 return; 1497 return;
… …
1698 object *skill_obj; 1540 object *skill_obj;
1699 1541
1700 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1542 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1701 if (!skill_obj) 1543 if (!skill_obj)
1702 { 1544 {
1703 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1545 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1704 return NULL; 1546 return NULL;
1705 } 1547 }
1548
1706 /* clear the flag - exp goes into this bucket, but player 1549 /* clear the flag - exp goes into this bucket, but player
1707 * still doesn't know it. 1550 * still doesn't know it.
1708 */ 1551 */
1709 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1552 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1710 skill_obj->stats.exp = 0; 1553 skill_obj->stats.exp = 0;
1711 skill_obj->level = 1; 1554 skill_obj->level = 1;
1712 insert_ob_in_ob (skill_obj, op); 1555 op->insert (skill_obj);
1713 1556
1714 if (op->contr) 1557 if (player *pl = op->contr)
1715 { 1558 pl->link_skills ();
1716 op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;
1717 if (op->contr->ns)
1718 op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1719 }
1720 1559
1721 return skill_obj; 1560 return skill_obj;
1722} 1561}
1723
1724 1562
1725/* player_lvl_adj() - for the new exp system. we are concerned with 1563/* player_lvl_adj() - for the new exp system. we are concerned with
1726 * whether the player gets more hp, sp and new levels. 1564 * whether the player gets more hp, sp and new levels.
1727 * Note this this function should only be called for players. Monstes 1565 * Note this this function should only be called for players. Monstes
1728 * don't really gain levels 1566 * don't really gain levels
… …
1731 */ 1569 */
1732void 1570void
1733player_lvl_adj (object *who, object *op) 1571player_lvl_adj (object *who, object *op)
1734{ 1572{
1735 char buf[MAX_BUF]; 1573 char buf[MAX_BUF];
1574 bool changed = false;
1736 1575
1737 if (!op) /* when rolling stats */ 1576 if (!op) /* when rolling stats */
1738 op = who; 1577 op = who;
1739 1578
1740 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1579 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1741 { 1580 {
1581 changed = true;
1582
1742 op->level++; 1583 op->level++;
1743 1584
1744 if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1585 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1745 dragon_level_gain (who); 1586 dragon_level_gain (who);
1746 1587
1747 /* Only roll these if it is the player (who) that gained the level */ 1588 /* Only roll these if it is the player (who) that gained the level */
1748 if (op == who && (who->level < 11) && who->type == PLAYER) 1589 if (op == who && (who->level < 11) && who->type == PLAYER)
1749 { 1590 {
1750 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1591 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1751 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1592 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1752 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1593 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1753 } 1594 }
1754 1595
1755 who->update_stats ();
1756 if (op->level > 1) 1596 if (op->level > 1)
1757 { 1597 {
1758 if (op->type != PLAYER) 1598 if (op->type != PLAYER)
1599 {
1600 who->contr->play_sound (sound_find ("skill_up"));
1759 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1601 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1602 }
1760 else 1603 else
1604 {
1605 who->contr->play_sound (sound_find ("level_up"));
1761 sprintf (buf, "You are now level %d.", op->level); 1606 sprintf (buf, "You are now level %d.", op->level);
1607 }
1608
1762 if (who) 1609 if (who)
1763 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1610 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1764 } 1611 }
1765 player_lvl_adj (who, op); /* To increase more levels */
1766 } 1612 }
1613
1767 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1614 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1768 { 1615 {
1616 changed = true;
1617
1769 op->level--; 1618 op->level--;
1770 who->update_stats (); 1619
1771 if (op->type != PLAYER) 1620 if (op->type != PLAYER)
1772 { 1621 {
1773 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1622 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1774 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1623 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1775 } 1624 }
1776 player_lvl_adj (who, op); /* To decrease more levels */
1777 } 1625 }
1778 1626
1779 /* check if the spell data has changed */ 1627 if (changed)
1780 esrv_update_stats (who->contr); 1628 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1781 esrv_update_spells (who->contr);
1782} 1629}
1783 1630
1784/* 1631/*
1785 * Returns how much experience is needed for a player to become 1632 * Returns how much experience is needed for a player to become
1786 * the given level. level should really never exceed max_level 1633 * the given level. level should really never exceed max_level
… …
1830 * flag is what to do if the player doesn't have the skill: 1677 * flag is what to do if the player doesn't have the skill:
1831 */ 1678 */
1832static void 1679static void
1833add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1680add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1834{ 1681{
1835 object *skill_obj = NULL; 1682 object *skill_obj;
1836 sint64 limit, exp_to_add; 1683 sint64 limit, exp_to_add;
1837 int i; 1684 int i;
1838 1685
1839 /* prevents some forms of abuse. */ 1686 /* prevents some forms of abuse. */
1840 if (op->contr->braced) 1687 if (op->contr->braced)
1841 exp = exp / 5; 1688 exp /= 5;
1842 1689
1843 /* Try to find the matching skill. 1690 /* Try to find the matching skill.
1844 * We do a shortcut/time saving mechanism first - see if it matches 1691 * We do a shortcut/time saving mechanism first - see if it matches
1845 * chosen_skill. This means we don't need to search through 1692 * chosen_skill. This means we don't need to search through
1846 * the players inventory. 1693 * the players inventory.
1847 */ 1694 */
1695 skill_obj = 0;
1696
1848 if (skill_name) 1697 if (skill_name)
1849 { 1698 {
1850 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1699 skill_obj = op->contr->find_skill (skill_name);
1851 skill_obj = op->chosen_skill;
1852 else
1853 {
1854 for (i = 0; i < NUM_SKILLS; i++)
1855 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1856 {
1857 skill_obj = op->contr->last_skill_ob[i];
1858 break;
1859 }
1860 1700
1861 /* Player doesn't have the skill. Check to see what to do, and give 1701 /* Player doesn't have the skill. Check to see what to do, and give
1862 * it to the player if necessary 1702 * it to the player if necessary
1863 */ 1703 */
1864 if (!skill_obj) 1704 if (!skill_obj)
1865 { 1705 {
1866 if (flag == SK_EXP_NONE) 1706 if (flag == SK_EXP_NONE)
1867 return; 1707 return;
1708
1868 else if (flag == SK_EXP_ADD_SKILL) 1709 if (flag == SK_EXP_ADD_SKILL)
1869 give_skill_by_name (op, skill_name); 1710 skill_obj = give_skill_by_name (op, skill_name);
1870 }
1871 } 1711 }
1872 } 1712 }
1873 1713
1874 if (flag != SK_EXP_SKILL_ONLY) 1714 if (flag != SK_EXP_SKILL_ONLY)
1875 { 1715 {
… …
1908 player_lvl_adj (op, skill_obj); 1748 player_lvl_adj (op, skill_obj);
1909 } 1749 }
1910} 1750}
1911 1751
1912/* This function checks to make sure that object 'op' can 1752/* This function checks to make sure that object 'op' can
1913 * lost 'exp' experience. It returns the amount of exp 1753 * lose 'exp' experience. It returns the amount of exp
1914 * object 'op' can in fact lose - it basically makes 1754 * object 'op' can in fact lose - it basically makes
1915 * adjustments based on permanent exp and the like. 1755 * adjustments based on permanent exp and the like.
1916 * This function should always be used for losing experience - 1756 * This function should always be used for losing experience -
1917 * the 'exp' value passed should be positive - this is the 1757 * the 'exp' value passed should be positive - this is the
1918 * amount that should get subtract from the player. 1758 * amount that should get subtract from the player.
1919 */ 1759 */
1920sint64 1760static sint64
1921check_exp_loss (const object *op, sint64 exp) 1761check_exp_loss (const object *op, sint64 exp)
1922{ 1762{
1923 sint64 del_exp; 1763 sint64 del_exp;
1924 1764
1925 if (exp > op->stats.exp) 1765 if (exp > op->stats.exp)
1926 exp = op->stats.exp; 1766 exp = op->stats.exp;
1767
1927 if (settings.permanent_exp_ratio) 1768 if (settings.permanent_exp_ratio)
1928 { 1769 {
1929 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1770 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1771
1930 if (del_exp < 0) 1772 if (del_exp < 0)
1931 del_exp = 0; 1773 del_exp = 0;
1774
1932 if (exp > del_exp) 1775 if (exp > del_exp)
1933 exp = del_exp; 1776 exp = del_exp;
1934 } 1777 }
1778
1935 return exp; 1779 return exp;
1936} 1780}
1937 1781
1938sint64 1782sint64
1939check_exp_adjust (const object *op, sint64 exp) 1783check_exp_adjust (const object *op, sint64 exp)
1940{ 1784{
1941 if (exp < 0) 1785 if (exp < 0)
1942 return check_exp_loss (op, exp); 1786 return check_exp_loss (op, exp);
1943 else 1787 else
1944 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1788 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1945} 1789}
1946
1947 1790
1948/* Subtracts experience from player. 1791/* Subtracts experience from player.
1949 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1792 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1950 * only subtract from the matching skill. Otherwise, 1793 * only subtract from the matching skill. Otherwise,
1951 * this subtracts a portion from all 1794 * this subtracts a portion from all
… …
1965 sint64 del_exp; 1808 sint64 del_exp;
1966 1809
1967 for (tmp = op->inv; tmp; tmp = tmp->below) 1810 for (tmp = op->inv; tmp; tmp = tmp->below)
1968 if (tmp->type == SKILL && tmp->stats.exp) 1811 if (tmp->type == SKILL && tmp->stats.exp)
1969 { 1812 {
1970 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1813 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1971 { 1814 {
1972 del_exp = check_exp_loss (tmp, exp); 1815 del_exp = check_exp_loss (tmp, exp);
1973 tmp->stats.exp -= del_exp; 1816 tmp->stats.exp -= del_exp;
1974 player_lvl_adj (op, tmp); 1817 player_lvl_adj (op, tmp);
1975 } 1818 }
… …
2063 * amount of permenent experience, whichever gives the lowest loss. 1906 * amount of permenent experience, whichever gives the lowest loss.
2064 */ 1907 */
2065void 1908void
2066apply_death_exp_penalty (object *op) 1909apply_death_exp_penalty (object *op)
2067{ 1910{
2068 object *tmp;
2069 sint64 loss; 1911 sint64 loss;
2070 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1912 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
2071 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1913 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
2072 1914
2073 for (tmp = op->inv; tmp; tmp = tmp->below) 1915 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2074 if (tmp->type == SKILL && tmp->stats.exp) 1916 if (tmp->type == SKILL && tmp->stats.exp)
2075 { 1917 {
2076
2077 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1918 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
2078 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1919 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
2079 1920
2080 /* With the revised exp system, you can get cases where 1921 /* With the revised exp system, you can get cases where
2081 * losing several levels would still require that you have more 1922 * losing several levels would still require that you have more
2082 * exp than you currently have - this is true if the levels 1923 * exp than you currently have - this is true if the levels
2083 * tables is a lot harder. 1924 * tables is a lot harder.
2084 */ 1925 */
2085 if (level_loss < 0) 1926 if (level_loss < 0)
2086 level_loss = 0; 1927 level_loss = 0;
2087 1928
2088 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1929 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
2089 1930
2090 tmp->stats.exp -= loss; 1931 tmp->stats.exp -= loss;
2091 player_lvl_adj (op, tmp); 1932 player_lvl_adj (op, tmp);
2092 } 1933 }
2093 1934
2094 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1935 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2095 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1936 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1937
2096 if (level_loss < 0) 1938 if (level_loss < 0)
2097 level_loss = 0; 1939 level_loss = 0;
1940
2098 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1941 loss = check_exp_loss (op, min (level_loss, percentage_loss));
2099 1942
2100 op->stats.exp -= loss; 1943 op->stats.exp -= loss;
2101 player_lvl_adj (op, NULL); 1944 player_lvl_adj (op, NULL);
2102} 1945}
2103 1946

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines