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.52 by root, Sat May 12 18:34:19 2007 UTC vs.
Revision 1.114 by root, Sun Mar 28 18:44:21 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 */
263/* 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,
264 * 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
265 * 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.
266 */ 265 */
267#define DIFF_MSG(flag, msg1, msg2) \ 266#define DIFF_MSG(flag, msg1, msg2) \
268 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 267 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
269 268
270/* 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. */
271 270
272/* 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
273 * the object. 272 * the object.
281 * that gives them that ability. 280 * that gives them that ability.
282 */ 281 */
283int 282int
284change_abil (object *op, object *tmp) 283change_abil (object *op, object *tmp)
285{ 284{
286 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0; 285 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
286 int success = 0;
287 char message[MAX_BUF]; 287 char message[MAX_BUF];
288 int potion_max = 0; 288 int potion_max = 0;
289 289
290 /* remember what object was like before it was changed. note that 290 // keep some stats for comparison purposes
291 * refop is a local copy of op only to be used for detecting changes 291 object::flags_t prev_flag = op->flag;
292 * found by update_stats. refop is not a real object 292 MoveType prev_move_type = op->move_type;
293 */ 293 sint16 prev_resist [NROFATTACKS]; // clumsy
294 object_copy refop = *op; 294 assert (sizeof (prev_resist) == sizeof (op->resist));
295 memcpy (prev_resist, op->resist, sizeof (prev_resist));
295 296
296 if (op->type == PLAYER) 297 if (op->type == PLAYER)
297 { 298 {
298 if (tmp->type == POTION) 299 if (tmp->type == POTION)
299 { 300 {
300 potion_max = 1; 301 potion_max = 1;
302
301 for (int j = 0; j < NUM_STATS; j++) 303 for (int j = 0; j < NUM_STATS; j++)
302 { 304 {
303 int ostat = op->contr->orig_stats.stat (j); 305 int ostat = op->contr->orig_stats.stat (j);
304 int i = tmp->stats.stat (j); 306 int i = tmp->stats.stat (j);
305 307
306 /* 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 */
307 int nstat = flag * i + ostat; 309 int nstat = flag * i + ostat;
308 310
309 /* Do some bounds checking. While I don't think any 311 /* Do some bounds checking. There is the potential for potions
310 * potions do so right now, there is the potential for potions
311 * 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
312 * to allow for that. 313 * to allow for that.
313 */ 314 */
314 if (nstat < 1 && i * flag < 0) 315 if (nstat < 1 && i * flag < 0)
315 nstat = 1; 316 nstat = 1;
316 else if (nstat > 20 + op->arch->clone.stats.stat (j)) 317 else if (nstat > 20 + op->arch->stats.stat (j))
317 nstat = 20 + op->arch->clone.stats.stat (j); 318 nstat = 20 + op->arch->stats.stat (j);
318 319
319 if (nstat != ostat) 320 if (nstat != ostat)
320 { 321 {
321 op->contr->orig_stats.stat (j) = nstat; 322 op->contr->orig_stats.stat (j) = nstat;
322 potion_max = 0; 323 potion_max = 0;
367 { 368 {
368 success = 1; 369 success = 1;
369 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.");
370 } 371 }
371 372
372 if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) 373 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
373 { 374 {
374 success = 1; 375 success = 1;
375 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.");
376 } 377 }
377 378
378 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])
379 { 380 {
380 success = 1; 381 success = 1;
381 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.");
382 } 383 }
383 384
384 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])
385 { 386 {
386 success = 1; 387 success = 1;
387 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.");
388 } 389 }
389 390
391 * user has multiple items giving the same type appled like we 392 * user has multiple items giving the same type appled like we
392 * 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
393 * can be misleading (a little higher could be miscontrued from 394 * can be misleading (a little higher could be miscontrued from
394 * from fly high) 395 * from fly high)
395 */ 396 */
396 if (tmp->move_type && op->move_type != refop.move_type) 397 if (tmp->move_type && op->move_type != prev_move_type)
397 { 398 {
398 success = 1; 399 success = 1;
399 400
400 /* 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
401 * status doesn't make a difference if you are flying high 402 * status doesn't make a difference if you are flying high
402 */ 403 */
403 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))
404 { 405 {
405 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.");
406 } 407 }
407 408
408 if (tmp->move_type & MOVE_FLY_HIGH) 409 if (tmp->move_type & MOVE_FLY_HIGH)
409 { 410 {
410 /* double conditional - second case covers if you have move_fly_low - 411 /* double conditional - second case covers if you have move_fly_low -
414 (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."));
415 } 416 }
416 417
417 if (tmp->move_type & MOVE_SWIM) 418 if (tmp->move_type & MOVE_SWIM)
418 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");
419
420 /* Changing move status may mean you are affected by things you weren't before */
421 check_move_on (op, op);
422 } 420 }
423 421
424 /* becoming UNDEAD... a special treatment for this flag. Only those not 422 /* becoming UNDEAD... a special treatment for this flag. Only those not
425 * originally undead may change their status 423 * originally undead may change their status
426 */ 424 */
427 if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 425 if (!op->arch->flag [FLAG_UNDEAD])
428 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 426 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
429 { 427 {
430 success = 1; 428 success = 1;
431 if (flag > 0) 429 if (flag > 0)
432 { 430 {
433 op->race = "undead"; 431 op->race = "undead";
434 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!"); 432 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
435 } 433 }
436 else 434 else
437 { 435 {
438 op->race = op->arch->clone.race; 436 op->race = op->arch->race;
439 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 437 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
440 } 438 }
441 } 439 }
442 440
443 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 441 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
444 { 442 {
445 success = 1; 443 success = 1;
446 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 444 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
447 } 445 }
448 446
449 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])
450 { 448 {
451 success = 1; 449 success = 1;
452 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 450 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
453 } 451 }
454 452
455 /* 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
456 * vision 454 * vision
457 */ 455 */
458 if (QUERY_FLAG (tmp, FLAG_BLIND)) 456 if (tmp->flag [FLAG_BLIND])
459 { 457 {
460 success = 1; 458 success = 1;
461 if (flag > 0) 459 if (flag > 0)
462 { 460 {
463 if (QUERY_FLAG (op, FLAG_WIZ)) 461 if (op->flag [FLAG_WIZ])
464 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.");
465 else 463 else
466 { 464 {
467 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 465 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
468 SET_FLAG (op, FLAG_BLIND); 466 SET_FLAG (op, FLAG_BLIND);
470 op->contr->do_los = 1; 468 op->contr->do_los = 1;
471 } 469 }
472 } 470 }
473 else 471 else
474 { 472 {
475 if (QUERY_FLAG (op, FLAG_WIZ)) 473 if (op->flag [FLAG_WIZ])
476 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.");
477 else 475 else
478 { 476 {
479 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 477 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
480 CLEAR_FLAG (op, FLAG_BLIND); 478 CLEAR_FLAG (op, FLAG_BLIND);
482 op->contr->do_los = 1; 480 op->contr->do_los = 1;
483 } 481 }
484 } 482 }
485 } 483 }
486 484
487 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])
488 { 486 {
489 success = 1; 487 success = 1;
490 if (op->type == PLAYER) 488 if (op->type == PLAYER)
491 op->contr->do_los = 1; 489 op->contr->do_los = 1;
492 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.");
493 } 491 }
494 492
495 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 493 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
496 { 494 {
497 success = 1; 495 success = 1;
498 if (flag > 0) 496 if (flag > 0)
499 { 497 {
500 if (QUERY_FLAG (op, FLAG_WIZ)) 498 if (op->flag [FLAG_WIZ])
501 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.");
502 else 500 else
503 { 501 {
504 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 502 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
505 if (op->type == PLAYER) 503 if (op->type == PLAYER)
506 op->contr->do_los = 1; 504 op->contr->do_los = 1;
507 } 505 }
508 } 506 }
509 else 507 else
510 { 508 {
511 if (QUERY_FLAG (op, FLAG_WIZ)) 509 if (op->flag [FLAG_WIZ])
512 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.");
513 else 511 else
514 { 512 {
515 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.");
516 if (op->type == PLAYER) 514 if (op->type == PLAYER)
554 for (int i = 0; i < NROFATTACKS; i++) 552 for (int i = 0; i < NROFATTACKS; i++)
555 { 553 {
556 if (i == ATNR_PHYSICAL) 554 if (i == ATNR_PHYSICAL)
557 continue; /* Don't display about armour */ 555 continue; /* Don't display about armour */
558 556
559 if (op->resist[i] != refop.resist[i]) 557 if (op->resist [i] != prev_resist [i])
560 { 558 {
561 success = 1; 559 success = 1;
560
562 if (op->resist[i] > refop.resist[i]) 561 if (op->resist [i] > prev_resist [i])
563 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]);
564 else 563 else
565 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]);
566 565
567 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 566 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
568 } 567 }
569 } 568 }
570 569
571 if (!potion_max) 570 if (!potion_max)
572 {
573 for (int j = 0; j < NUM_STATS; j++) 571 for (int j = 0; j < NUM_STATS; j++)
574 {
575 if (int i = tmp->stats.stat (j)) 572 if (int i = tmp->stats.stat (j))
576 { 573 {
577 success = 1; 574 success = 1;
578 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 575 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
579 } 576 }
580 }
581 }
582 577
583 return success; 578 return success;
584} 579}
585 580
586/* 581/*
597object::drain_specific_stat (int deplete_stats) 592object::drain_specific_stat (int deplete_stats)
598{ 593{
599 object *tmp; 594 object *tmp;
600 archetype *at; 595 archetype *at;
601 596
602 at = archetype::find (ARCH_DEPLETION); 597 at = archetype::find (shstr_depletion);
603 if (!at) 598 if (!at)
604 { 599 {
605 LOG (llevError, "Couldn't find archetype depletion.\n"); 600 LOG (llevError, "Couldn't find archetype depletion.\n");
606 return; 601 return;
607 } 602 }
609 { 604 {
610 tmp = present_arch_in_ob (at, this); 605 tmp = present_arch_in_ob (at, this);
611 606
612 if (!tmp) 607 if (!tmp)
613 { 608 {
614 tmp = arch_to_object (at); 609 tmp = at->instance ();
615 tmp = insert_ob_in_ob (tmp, this); 610 tmp = insert_ob_in_ob (tmp, this);
616 SET_FLAG (tmp, FLAG_APPLIED); 611 SET_FLAG (tmp, FLAG_APPLIED);
617 } 612 }
618 } 613 }
619 614
627 * via an applied bad_luck object. 622 * via an applied bad_luck object.
628 */ 623 */
629void 624void
630object::change_luck (int value) 625object::change_luck (int value)
631{ 626{
632 archetype *at = archetype::find ("luck"); 627 archetype *at = archetype::find (shstr_luck);
633 if (!at) 628 if (!at)
634 LOG (llevError, "Couldn't find archetype luck.\n"); 629 LOG (llevError, "Couldn't find archetype luck.\n");
635 else 630 else
636 { 631 {
637 object *tmp = present_arch_in_ob (at, this); 632 object *tmp = present_arch_in_ob (at, this);
639 if (!tmp) 634 if (!tmp)
640 { 635 {
641 if (!value) 636 if (!value)
642 return; 637 return;
643 638
644 tmp = arch_to_object (at); 639 tmp = at->instance ();
645 tmp = insert_ob_in_ob (tmp, this); 640 tmp = insert_ob_in_ob (tmp, this);
646 SET_FLAG (tmp, FLAG_APPLIED); 641 SET_FLAG (tmp, FLAG_APPLIED);
647 } 642 }
648 643
649 if (value) 644 if (value)
685void 680void
686object::remove_statbonus () 681object::remove_statbonus ()
687{ 682{
688 for (int i = 0; i < NUM_STATS; ++i) 683 for (int i = 0; i < NUM_STATS; ++i)
689 { 684 {
690 sint8 v = arch->clone.stats.stat (i); 685 sint8 v = arch->stats.stat (i);
691 stats.stat (i) -= v; 686 stats.stat (i) -= v;
692 contr->orig_stats.stat (i) -= v; 687 contr->orig_stats.stat (i) -= v;
693 } 688 }
694} 689}
695 690
699void 694void
700object::add_statbonus () 695object::add_statbonus ()
701{ 696{
702 for (int i = 0; i < NUM_STATS; ++i) 697 for (int i = 0; i < NUM_STATS; ++i)
703 { 698 {
704 sint8 v = arch->clone.stats.stat (i); 699 sint8 v = arch->stats.stat (i);
705 stats.stat (i) += v; 700 stats.stat (i) += v;
706 contr->orig_stats.stat (i) += v; 701 contr->orig_stats.stat (i) += v;
707 } 702 }
708} 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;
709 744
710/* 745/*
711 * Updates all abilities given by applied objects in the inventory 746 * Updates all abilities given by applied objects in the inventory
712 * of the given object. Note: This function works for both monsters 747 * of the given object. Note: This function works for both monsters
713 * 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.
718 * spell system split, grace points now added to system --peterm 753 * spell system split, grace points now added to system --peterm
719 */ 754 */
720void 755void
721object::update_stats () 756object::update_stats ()
722{ 757{
723 int i, j;
724 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;
725 int weapon_weight = 0, weapon_speed = 0; 759 int weapon_weight = 0, weapon_speed = 0;
726 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 760 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
727 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 761 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
728 object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; 762 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
729 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
730 767
731 /* 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 */
732 if (type == PLAYER) 769 if (type == PLAYER)
733 { 770 {
771 contr->delayed_update = false;
772
734 for (i = 0; i < NUM_STATS; i++) 773 for (int i = 0; i < NUM_STATS; i++)
735 stats.stat (i) = contr->orig_stats.stat (i); 774 stat_sum [i] = contr->orig_stats.stat (i);
736 775
737 if (settings.spell_encumbrance == TRUE) 776 if (settings.spell_encumbrance == TRUE)
738 contr->encumbrance = 0; 777 contr->encumbrance = 0;
739 778
740 attacktype = 0; 779 attacktype = 0;
760 799
761 CLEAR_FLAG (this, FLAG_LIFESAVE); 800 CLEAR_FLAG (this, FLAG_LIFESAVE);
762 CLEAR_FLAG (this, FLAG_STEALTH); 801 CLEAR_FLAG (this, FLAG_STEALTH);
763 CLEAR_FLAG (this, FLAG_BLIND); 802 CLEAR_FLAG (this, FLAG_BLIND);
764 803
765 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);
766 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);
767 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 806 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
768 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);
769 808
770 path_attuned = arch->clone.path_attuned; 809 path_attuned = arch->path_attuned;
771 path_repelled = arch->clone.path_repelled; 810 path_repelled = arch->path_repelled;
772 path_denied = arch->clone.path_denied; 811 path_denied = arch->path_denied;
773 glow_radius = arch->clone.glow_radius; 812 glow_radius = arch->glow_radius;
774 move_type = arch->clone.move_type; 813 move_type = arch->move_type;
775 814
776 chosen_skill = 0; 815 object *chosen_skill = 0;
777 816
778 /* initializing resistances from the values in player/monster's 817 /* initializing resistances from the values in player/monster's
779 * archetype clone 818 * archetype clone
780 */ 819 */
781 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 820 memcpy (&resist, &arch->resist, sizeof (resist));
782 821
783 for (i = 0; i < NROFATTACKS; i++) 822 for (int i = 0; i < NROFATTACKS; i++)
784 { 823 {
785 if (resist[i] > 0) 824 if (resist[i] > 0)
786 prot[i] = resist[i], vuln[i] = 0; 825 prot[i] = resist[i], vuln[i] = 0;
787 else 826 else
788 vuln[i] = -(resist[i]), prot[i] = 0; 827 vuln[i] = -resist[i], prot[i] = 0;
789 828
790 potion_resist[i] = 0; 829 potion_resist[i] = -1000;
791 } 830 }
792 831
793 wc = arch->clone.stats.wc; 832 wc = arch->stats.wc;
794 stats.dam = arch->clone.stats.dam; 833 stats.dam = arch->stats.dam;
795 834
796 /* for players which cannot use armour, they gain AC -1 per 3 levels, 835 /* for players which cannot use armour, they gain AC -1 per 3 levels,
797 * plus a small amount of physical resist, those poor suckers. ;) 836 * plus a small amount of physical resist, those poor suckers. ;)
798 * the fact that maxlevel is factored in could be considered sort of bogus - 837 * the fact that maxlevel is factored in could be considered sort of bogus -
799 * we should probably give them some bonus and cap it off - otherwise, 838 * we should probably give them some bonus and cap it off - otherwise,
800 * basically, if a server updates its max level, these playes may find 839 * basically, if a server updates its max level, these playes may find
801 * that their protection from physical goes down 840 * that their protection from physical goes down
802 */ 841 */
803 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 842 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
804 { 843 {
805 ac = MAX (-10, arch->clone.stats.ac - level / 3); 844 ac = max (-10, arch->stats.ac - level / 3);
806 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 845 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
807 } 846 }
808 else 847 else
809 ac = arch->clone.stats.ac; 848 ac = arch->stats.ac;
810 849
811 stats.luck = arch->clone.stats.luck; 850 stats.luck = arch->stats.luck;
812 speed = arch->clone.speed; 851 speed = arch->speed;
813 852
814 /* 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.
815 * 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.
816 */ 855 */
817 for (tmp = inv; tmp; tmp = tmp->below) 856 for (tmp = inv; tmp; tmp = tmp->below)
818 { 857 {
819 /* See note in map.c:update_position about making this additive
820 * since light sources are never applied, need to put check here.
821 */
822 if (tmp->glow_radius > glow_radius)
823 glow_radius = tmp->glow_radius;
824
825 /* This happens because apply_potion calls change_abil with the potion 858 /* This happens because apply_potion calls change_abil with the potion
826 * 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
827 * then calls this function. 860 * then calls this function.
828 */ 861 */
829 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
830 continue; 863 continue;
864
865 glow_radius += tmp->glow_radius;
831 866
832 /* For some things, we don't care what is equipped */ 867 /* For some things, we don't care what is equipped */
833 if (tmp->type == SKILL) 868 if (tmp->type == SKILL)
834 { 869 {
835 /* Want to take the highest skill here. */ 870 /* Want to take the highest skill here. */
848 else if (tmp->level > grace_obj->level) 883 else if (tmp->level > grace_obj->level)
849 grace_obj = tmp; 884 grace_obj = tmp;
850 } 885 }
851 } 886 }
852 887
853 /* Container objects are not meant to adjust a players, but other applied 888 /* Container objects are not meant to adjust players, but other applied
854 * objects need to make adjustments. 889 * objects need to make adjustments.
855 * This block should handle all player specific changes 890 * This block should handle all player specific changes
856 * 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
857 * in the praying skill, and the player should always get those. 892 * in the praying skill, and the player should always get those.
858 * 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,
860 * up, etc. 895 * up, etc.
861 */ 896 */
862 if ((tmp->flag [FLAG_APPLIED] 897 if ((tmp->flag [FLAG_APPLIED]
863 && tmp->type != CONTAINER 898 && tmp->type != CONTAINER
864 && tmp->type != CLOSE_CON) 899 && tmp->type != CLOSE_CON)
865 || (tmp->type == SKILL
866 && tmp->subtype == SK_PRAYING)) 900 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
867 { 901 {
868 if (type == PLAYER) 902 if (type == PLAYER)
869 { 903 {
904 contr->item_power += tmp->item_power;
905
870 if (tmp == contr->combat_ob || tmp == contr->ranged_ob) 906 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
907 if (tmp != current_weapon
871 if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)) 908 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
909 && !tmp->flag [FLAG_CURSED]
910 && !tmp->flag [FLAG_DAMNED])
872 continue; 911 continue;
873 912
874 for (i = 0; i < NUM_STATS; i++) 913 for (int i = 0; i < NUM_STATS; i++)
875 change_attr_value (&stats, i, tmp->stats.stat (i)); 914 stat_sum [i] += tmp->stats.stat (i);
876 915
877 /* these are the items that currently can change digestion, regeneration, 916 if (digest_types [tmp->type])
878 * spell point recovery and mana point recovery. Seems sort of an arbitary
879 * list, but other items store other info into stats array.
880 */
881 if (tmp->type == WEAPON || tmp->type == BOW ||
882 tmp->type == ARMOUR || tmp->type == HELMET ||
883 tmp->type == SHIELD || tmp->type == RING ||
884 tmp->type == BOOTS || tmp->type == GLOVES ||
885 tmp->type == AMULET || tmp->type == GIRDLE ||
886 tmp->type == BRACERS || tmp->type == CLOAK ||
887 tmp->type == DISEASE || tmp->type == FORCE ||
888 tmp->type == SKILL)
889 { 917 {
890 contr->digestion += tmp->stats.food; 918 contr->digestion += tmp->stats.food;
891 contr->gen_hp += tmp->stats.hp; 919 contr->gen_hp += tmp->stats.hp;
920 if (tmp->type != BOW) // ugly exception for bows
892 contr->gen_sp += tmp->stats.sp; 921 contr->gen_sp += tmp->stats.sp;
893 contr->gen_grace += tmp->stats.grace; 922 contr->gen_grace += tmp->stats.grace;
894 contr->gen_sp_armour += tmp->gen_sp_armour; 923 contr->gen_sp_armour += tmp->gen_sp_armour;
895 contr->item_power += tmp->item_power;
896 } 924 }
897 } /* if this is a player */ 925 } /* if this is a player */
898 else 926 else
899 { 927 {
900 if (tmp->type == WEAPON) 928 if (tmp->type == WEAPON)
901 current_weapon = tmp; 929 current_weapon = tmp;
902 } 930 }
903 931
904 /* Update slots used for items */ 932 /* Update slots used for items */
905 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 933 if (tmp->flag [FLAG_APPLIED])
906 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 934 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
907 slot[i].used += tmp->slot[i].info; 935 slot[i].used += tmp->slot[i].info;
908 936
909 if (tmp->type == SYMPTOM) 937 if (tmp->type == SYMPTOM)
910 {
911 speed_reduce_from_disease = tmp->last_sp / 100.f; 938 min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
912 939
913 if (speed_reduce_from_disease == 0)
914 speed_reduce_from_disease = 1;
915 }
916
917 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 940 /* Pos. and neg. protections are counted separate (-> pro/vuln).
918 * (Negative protections are calculated exactly like positive.) 941 * (Negative protections are calculated exactly like positive.)
919 * Resistance from potions are treated special as well. If there's 942 * Resistance from potions are treated special as well. If there's
920 * more than one potion-effect, the bigger prot.-value is taken. 943 * more than one potion-effect, the bigger prot.-value is taken.
921 */ 944 */
922 if (tmp->type != POTION) 945 if (tmp->type == POTION_EFFECT)
923 {
924 for (i = 0; i < NROFATTACKS; i++) 946 for (int i = 0; i < NROFATTACKS; i++)
925 {
926 /* Potential for cursed potions, in which case we just can use
927 * a straight MAX, as potion_resist is initialised to zero.
928 */
929 if (tmp->type == POTION_EFFECT)
930 {
931 if (potion_resist[i])
932 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
933 else
934 potion_resist[i] = tmp->resist[i]; 947 max_it (potion_resist[i], tmp->resist[i]);
935 } 948 else if (tmp->type != POTION)
949 for (int i = 0; i < NROFATTACKS; i++)
936 else if (tmp->resist[i] > 0) 950 if (tmp->resist[i] > 0)
937 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 951 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
938 else if (tmp->resist[i] < 0) 952 else if (tmp->resist[i] < 0)
939 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 953 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
940 }
941 }
942 954
943 /* There may be other things that should not adjust the attacktype */ 955 /* There may be other things that should not adjust the attacktype */
944 if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM) 956 if (tmp->type != SYMPTOM)
945 || current_weapon == tmp)
946 { 957 {
947 attacktype |= tmp->attacktype; 958 attacktype |= tmp->attacktype;
948 path_attuned |= tmp->path_attuned; 959 path_attuned |= tmp->path_attuned;
949 path_repelled |= tmp->path_repelled; 960 path_repelled |= tmp->path_repelled;
950 path_denied |= tmp->path_denied; 961 path_denied |= tmp->path_denied;
951 move_type |= tmp->move_type; 962 move_type |= tmp->move_type;
952 stats.luck += tmp->stats.luck; 963 stats.luck += tmp->stats.luck;
953 } 964 }
954 965
955 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 966 flag |= tmp->flag & copy_flags;
956 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
957 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
958 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
959 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
960 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
961 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
962 967
963 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) 968 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
964 SET_FLAG (this, FLAG_UNDEAD); 969 SET_FLAG (this, FLAG_UNDEAD);
965 970
966 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 971 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
967 { 972 {
968 SET_FLAG (this, FLAG_MAKE_INVIS); 973 SET_FLAG (this, FLAG_MAKE_INVIS);
980 added_speed += tmp->stats.exp; 985 added_speed += tmp->stats.exp;
981 } 986 }
982 987
983 switch (tmp->type) 988 switch (tmp->type)
984 { 989 {
985#if 0
986 case WAND:
987 case ROD:
988 case HORN:
989 if (type != PLAYER || current_weapon == tmp)
990 chosen_skill = tmp;
991 break;
992#endif
993
994 /* skills modifying the character -b.t. */ 990 /* skills modifying the character -b.t. */
995 /* for all skills and skill granting objects */ 991 /* for all skills and skill granting objects */
996 case SKILL: 992 case SKILL:
997 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 993 {
994 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
998 break; 995 break;
999 996
1000 if (IS_COMBAT_SKILL (tmp->subtype))
1001 wc_obj = tmp;
1002
1003 if (chosen_skill) 997 if (chosen_skill)
998 {
1004 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 999 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
1000 &name, &chosen_skill->name, &tmp->name);
1005 1001
1002 tmp->flag [FLAG_APPLIED] = false;
1003 update_stats ();
1004 return;
1005 }
1006 else
1006 chosen_skill = tmp; 1007 chosen_skill = tmp;
1007 1008
1008 if (tmp->stats.dam > 0) 1009 if (tmp->stats.dam > 0)
1009 { /* skill is a 'weapon' */ 1010 { /* skill is a 'weapon' */
1010 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1011 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1011 weapon_speed = WEAPON_SPEED (tmp); 1012 weapon_speed = WEAPON_SPEED (tmp);
1012 1013
1013 if (weapon_speed < 0) 1014 if (weapon_speed < 0)
1014 weapon_speed = 0; 1015 weapon_speed = 0;
1015 1016
1016 weapon_weight = tmp->weight; 1017 weapon_weight = tmp->weight;
1017 stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9)); 1018 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1018 1019
1019 if (tmp->magic) 1020 if (tmp->magic)
1020 stats.dam += tmp->magic; 1021 stats.dam += tmp->magic;
1021 } 1022 }
1022 1023
1023 if (tmp->stats.wc) 1024 if (tmp->stats.wc)
1024 wc -= tmp->stats.wc + tmp->magic; 1025 wc -= tmp->stats.wc + tmp->magic;
1025 1026
1026 if (tmp->slaying) 1027 if (tmp->slaying)
1027 slaying = tmp->slaying; 1028 slaying = tmp->slaying;
1028 1029
1029 if (tmp->stats.ac) 1030 if (tmp->stats.ac)
1030 ac -= tmp->stats.ac + tmp->magic; 1031 ac -= tmp->stats.ac + tmp->magic;
1031 1032
1032 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1033 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1033 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1034 contr->encumbrance += 3 * tmp->weight / 1000;
1034
1035 break; 1035 }
1036 1036
1037 case SKILL_TOOL:
1038 if (chosen_skill)
1039 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1040
1041 chosen_skill = tmp;
1042 break; 1037 break;
1043 1038
1044 case SHIELD: 1039 case SHIELD:
1045 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1040 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1046 contr->encumbrance += (int) tmp->weight / 2000; 1041 contr->encumbrance += tmp->weight / 2000;
1042 //FALLTHROUGH
1047 case RING: 1043 case RING:
1048 case AMULET: 1044 case AMULET:
1049 case GIRDLE: 1045 case GIRDLE:
1050 case HELMET: 1046 case HELMET:
1051 case BOOTS: 1047 case BOOTS:
1060 if (tmp->stats.ac) 1056 if (tmp->stats.ac)
1061 ac -= tmp->stats.ac + tmp->magic; 1057 ac -= tmp->stats.ac + tmp->magic;
1062 1058
1063 break; 1059 break;
1064 1060
1061 case WAND:
1062 case ROD:
1063 case HORN:
1064 case SKILL_TOOL:
1065 if (type != PLAYER)
1066 chosen_skill = find_skill_by_name (this, tmp->skill);
1067 break;
1068
1065 case BOW: 1069 case BOW:
1066 case WEAPON: 1070 case WEAPON:
1067 if (type != PLAYER || current_weapon == tmp) 1071 if (type != PLAYER || current_weapon == tmp)
1068 { 1072 {
1073 chosen_skill = find_skill_by_name (this, tmp->skill);
1074
1069 wc -= tmp->stats.wc + tmp->magic; 1075 wc -= tmp->stats.wc + tmp->magic;
1070 1076
1071 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1077 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1072 ac -= tmp->stats.ac + tmp->magic; 1078 ac -= tmp->stats.ac + tmp->magic;
1073 1079
1119 else /* To nullify the below effect */ 1125 else /* To nullify the below effect */
1120 ac += tmp->stats.ac + tmp->magic; 1126 ac += tmp->stats.ac + tmp->magic;
1121 } 1127 }
1122 1128
1123 if (tmp->stats.wc) 1129 if (tmp->stats.wc)
1124 wc -= (tmp->stats.wc + tmp->magic); 1130 wc -= tmp->stats.wc + tmp->magic;
1125 1131
1126 if (tmp->stats.ac) 1132 if (tmp->stats.ac)
1127 ac -= (tmp->stats.ac + tmp->magic); 1133 ac -= tmp->stats.ac + tmp->magic;
1128 1134
1129 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max) 1135 if (ARMOUR_SPEED (tmp))
1130 max = ARMOUR_SPEED (tmp) / 10.f; 1136 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1131 1137
1132 break; 1138 break;
1133 } /* switch tmp->type */ 1139 } /* switch tmp->type */
1134 } /* item is equipped */ 1140 } /* item is equipped */
1135 } /* for loop of items */ 1141 } /* for loop of items */
1142
1143 if (type != PLAYER)
1144 this->chosen_skill = chosen_skill;
1145
1146 min_it (glow_radius, MAX_LIGHT_RADIUS);
1136 1147
1137 /* We've gone through all the objects the player has equipped. For many things, we 1148 /* We've gone through all the objects the player has equipped. For many things, we
1138 * have generated intermediate values which we now need to assign. 1149 * have generated intermediate values which we now need to assign.
1139 */ 1150 */
1140 1151
1142 * If there is an uncursed potion in effect, granting more protection 1153 * If there is an uncursed potion in effect, granting more protection
1143 * than that, we take: 'total resistance = resistance from potion'. 1154 * than that, we take: 'total resistance = resistance from potion'.
1144 * If there is a cursed (and no uncursed) potion in effect, we take 1155 * If there is a cursed (and no uncursed) potion in effect, we take
1145 * 'total resistance = vulnerability from cursed potion'. 1156 * 'total resistance = vulnerability from cursed potion'.
1146 */ 1157 */
1147 for (i = 0; i < NROFATTACKS; i++) 1158 for (int i = 0; i < NROFATTACKS; i++)
1148 { 1159 {
1149 resist[i] = prot[i] - vuln[i]; 1160 resist[i] = prot[i] - vuln[i];
1150 1161
1151 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1162 if (potion_resist[i] != -1000
1163 && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1152 resist[i] = potion_resist[i]; 1164 resist[i] = potion_resist[i];
1153 } 1165 }
1154 1166
1155 /* Figure out the players sp/mana/hp totals. */
1156 if (type == PLAYER) 1167 if (type == PLAYER)
1157 { 1168 {
1169 // clamp various player stats
1170 for (int i = 0; i < NUM_STATS; ++i)
1171 stats.stat (i) = stat_sum [i];
1172
1173 check_stat_bounds (&stats);
1174
1175 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1176
1177 /* Figure out the players sp/mana/hp totals. */
1158 int pl_level; 1178 int pl_level;
1159 1179
1160 check_stat_bounds (&(stats));
1161 pl_level = level;
1162
1163 if (pl_level < 1)
1164 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1180 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1165 1181
1166 /* You basically get half a con bonus/level. But we do take into account rounding, 1182 /* You basically get half a con bonus/level. But we do take into account rounding,
1167 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1183 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1168 */ 1184 */
1169 for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) 1185 stats.maxhp = 0;
1186 for (int i = 1; i <= min (10, pl_level); i++)
1170 { 1187 {
1171 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1188 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1172 1189
1173 if (i % 2 && con_bonus[stats.Con] % 2) 1190 if (i % 2 && con_bonus[stats.Con] % 2)
1174 {
1175 if (con_bonus[stats.Con] > 0) 1191 if (con_bonus[stats.Con] > 0)
1176 j++; 1192 j++;
1177 else 1193 else
1178 j--; 1194 j--;
1179 }
1180 1195
1181 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ 1196 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1182 } 1197 }
1183 1198
1184 for (i = 11; i <= level; i++) 1199 stats.maxhp += 2 * max (0, level - 10);
1185 stats.maxhp += 2;
1186 1200
1187 if (stats.hp > stats.maxhp) 1201 if (stats.hp > stats.maxhp)
1188 stats.hp = stats.maxhp; 1202 stats.hp = stats.maxhp;
1189 1203
1190 /* Sp gain is controlled by the level of the player's 1204 /* Sp gain is controlled by the level of the player's
1203 1217
1204 if (mana_obj == this && type == PLAYER) 1218 if (mana_obj == this && type == PLAYER)
1205 stats.maxsp = 1; 1219 stats.maxsp = 1;
1206 else 1220 else
1207 { 1221 {
1208 sp_tmp = 0.f; 1222 float sp_tmp = 0.f;
1209 1223
1210 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1224 for (int i = 1; i <= min (10, mana_obj->level); i++)
1211 { 1225 {
1212 float stmp; 1226 float stmp;
1213 1227
1214 /* Got some extra bonus at first level */ 1228 /* Got some extra bonus at first level */
1215 if (i < 2) 1229 if (i < 2)
1216 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f; 1230 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1217 else 1231 else
1218 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; 1232 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1219 1233
1220 if (stmp < 1.f)
1221 stmp = 1.f;
1222
1223 sp_tmp += stmp; 1234 sp_tmp += max (1.f, stmp);
1224 } 1235 }
1225 1236
1226 stats.maxsp = (sint16)sp_tmp; 1237 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1227
1228 for (i = 11; i <= mana_obj->level; i++)
1229 stats.maxsp += 2;
1230 } 1238 }
1239
1231 /* Characters can get their sp supercharged via rune of transferrance */ 1240 /* Characters can get their sp supercharged via rune of transferrance */
1232 if (stats.sp > stats.maxsp * 2) 1241 stats.sp = min (stats.sp, stats.maxsp * 2);
1233 stats.sp = stats.maxsp * 2;
1234 1242
1235 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ 1243 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1236 if (!grace_obj || !grace_obj->level || type != PLAYER) 1244 if (!grace_obj || !grace_obj->level || type != PLAYER)
1237 grace_obj = this; 1245 grace_obj = this;
1238 1246
1243 /* store grace in a float - this way, the divisions below don't create 1251 /* store grace in a float - this way, the divisions below don't create
1244 * big jumps when you go from level to level - with int's, it then 1252 * big jumps when you go from level to level - with int's, it then
1245 * becomes big jumps when the sums of the bonuses jump to the next 1253 * becomes big jumps when the sums of the bonuses jump to the next
1246 * step of 8 - with floats, even fractional ones are useful. 1254 * step of 8 - with floats, even fractional ones are useful.
1247 */ 1255 */
1248 sp_tmp = 0.f; 1256 float sp_tmp = 0.f;
1249 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1257
1258 for (int i = 1; i <= min (10, grace_obj->level); i++)
1250 { 1259 {
1251 float grace_tmp = 0.f; 1260 float grace_tmp = 0.f;
1252 1261
1253 /* Got some extra bonus at first level */ 1262 /* Got some extra bonus at first level */
1254 if (i < 2) 1263 if (i < 2)
1255 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f; 1264 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1256 else 1265 else
1257 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; 1266 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1258 1267
1259 if (grace_tmp < 1.f)
1260 grace_tmp = 1.f;
1261
1262 sp_tmp += grace_tmp; 1268 sp_tmp += max (1.f, grace_tmp);
1263 } 1269 }
1264 1270
1265 stats.maxgrace = (sint16)sp_tmp;
1266
1267 /* two grace points per level after 11 */ 1271 /* two grace points per level after 10 */
1268 for (i = 11; i <= grace_obj->level; i++) 1272 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1269 stats.maxgrace += 2;
1270 } 1273 }
1274
1271 /* No limit on grace vs maxgrace */ 1275 /* No limit on grace vs maxgrace */
1272 1276
1273 if (contr->braced) 1277 if (contr->braced)
1274 { 1278 {
1275 ac += 2; 1279 ac += 2;
1287 * improvement every level, now its fighterlevel/5. So 1291 * improvement every level, now its fighterlevel/5. So
1288 * we give the player a bonus here in wc and dam 1292 * we give the player a bonus here in wc and dam
1289 * to make up for the change. Note that I left the 1293 * to make up for the change. Note that I left the
1290 * monster bonus the same as before. -b.t. 1294 * monster bonus the same as before. -b.t.
1291 */ 1295 */
1296 object *wc_obj = chosen_skill;
1292 1297
1293 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1298 if (contr && wc_obj && wc_obj->level > 1)
1294 { 1299 {
1295 wc -= wc_obj->level + thaco_bonus[stats.Str]; 1300 wc -= wc_obj->level + thaco_bonus[stats.Str];
1296 1301
1297 for (i = 1; i < wc_obj->level; i++) 1302 for (int i = 1; i < wc_obj->level; i++)
1298 { 1303 {
1299 /* addtional wc every 6 levels */ 1304 /* additional wc every 6 levels */
1300 if (!(i % 6)) 1305 if (!(i % 6))
1301 wc--; 1306 wc--;
1302 1307
1303 /* addtional dam every 4 levels. */ 1308 /* additional dam every 4 levels. */
1304 if (!(i % 4) && dam_bonus[stats.Str] >= 0) 1309 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1305 stats.dam += 1 + dam_bonus[stats.Str] / 5; 1310 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1306 } 1311 }
1307 } 1312 }
1308 else 1313 else
1315 1320
1316 speed = 1.f + speed_bonus[stats.Dex]; 1321 speed = 1.f + speed_bonus[stats.Dex];
1317 1322
1318 if (settings.search_items && contr->search_str[0]) 1323 if (settings.search_items && contr->search_str[0])
1319 speed -= 1; 1324 speed -= 1;
1320
1321 if (attacktype == 0)
1322 attacktype = arch->clone.attacktype;
1323
1324 } /* End if player */ 1325 } /* End if player */
1325 1326
1326 if (added_speed >= 0) 1327 if (added_speed >= 0)
1327 speed += added_speed / 10.f; 1328 speed += added_speed / 10.f;
1328 else /* Something wrong here...: */ 1329 else /* Something wrong here...: */
1329 speed /= 1.f - added_speed; 1330 speed /= 1.f - added_speed;
1330 1331
1331 /* Max is determined by armour */ 1332 /* Max is determined by armour */
1332 if (speed > max) 1333 speed = min (speed, max_speed);
1333 speed = max;
1334 1334
1335 if (type == PLAYER) 1335 if (type == PLAYER)
1336 { 1336 {
1337 /* f is a number the represents the number of kg above (positive num) 1337 /* f is a number the represents the number of kg above (positive num)
1338 * or below (negative number) that the player is carrying. If above 1338 * or below (negative number) that the player is carrying. If above
1339 * weight limit, then player suffers a speed reduction based on how 1339 * weight limit, then player suffers a speed reduction based on how
1340 * much above he is, and what is max carry is 1340 * much above he is, and what is max carry is
1341 */ 1341 */
1342 f = (carrying / 1000) - max_carry[stats.Str]; 1342 float f = (carrying / 1000) - max_carry[stats.Str];
1343 if (f > 0) 1343 if (f > 0.f)
1344 speed = speed / (1.f + f / max_carry[stats.Str]); 1344 speed = speed / (1.f + f / max_carry[stats.Str]);
1345 } 1345 }
1346 1346
1347 speed += bonus_speed / 10.f; /* Not affected by limits */ 1347 speed += bonus_speed / 10.f; /* Not affected by limits */
1348 speed *= speed_reduce_from_disease;
1348 1349
1349 /* Put a lower limit on speed. Note with this speed, you move once every 1350 /* Put a lower limit on speed. Note with this speed, you move once every
1350 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1351 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1351 */ 1352 */
1352 speed = speed * speed_reduce_from_disease; 1353 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1353 1354
1354 if (speed < 0.01f && type == PLAYER) 1355 if (speed != old_speed)
1355 speed = 0.01f; 1356 set_speed (speed);
1356 1357
1357 if (type == PLAYER) 1358 if (type == PLAYER)
1358 { 1359 {
1359 /* (This formula was made by vidarl@ifi.uio.no) 1360 /* (This formula was made by vidarl@ifi.uio.no)
1360 * Note that we never used these values again - basically 1361 * Note that we never used these values again - basically
1362 * that would just be a real pain to read. 1363 * that would just be a real pain to read.
1363 */ 1364 */
1364 float M = (max_carry[stats.Str] - 121) / 121.f; 1365 float M = (max_carry[stats.Str] - 121) / 121.f;
1365 float M2 = max_carry[stats.Str] / 100.f; 1366 float M2 = max_carry[stats.Str] / 100.f;
1366 float W = weapon_weight / 20000.f; 1367 float W = weapon_weight / 20000.f;
1367 float s = 2 - weapon_speed / 10.f; 1368 float s = (20 - weapon_speed) / 10.f;
1368 float D = (stats.Dex - 14) / 14.f; 1369 float D = (stats.Dex - 14) / 14.f;
1369 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f; 1370 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1370 1371
1371 K *= (4 + level) *1.2f / (6 + level); 1372 K *= (4 + level) * 1.2f / (6 + level);
1372 1373
1373 if (K <= 0.f) 1374 if (K <= 0.01f)
1374 K = 0.01f; 1375 K = 0.01f;
1375 1376
1376 float S = speed / (K * s); 1377 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1377
1378 contr->weapon_sp = S;
1379 } 1378 }
1380 1379
1381 /* I want to limit the power of small monsters with big weapons: */ 1380 /* I want to limit the power of small monsters with big weapons: */
1382 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) 1381 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1383 stats.dam = arch->clone.stats.dam * 3; 1382 stats.dam = arch->stats.dam * 3;
1384 1383
1385 /* Prevent overflows of wc - best you can get is ABS(120) - this 1384 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1386 * should be more than enough - remember, AC is also in 8 bits, 1385 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1387 * so its value is the same.
1388 */
1389 if (wc > 120)
1390 wc = 120;
1391 else if (wc < -120)
1392 wc = -120;
1393
1394 stats.wc = wc;
1395
1396 if (ac > 120)
1397 ac = 120;
1398 else if (ac < -120)
1399 ac = -120;
1400
1401 stats.ac = ac;
1402 1386
1403 /* if for some reason the creature doesn't have any move type, 1387 /* if for some reason the creature doesn't have any move type,
1404 * give them walking as a default. 1388 * give them walking as a default.
1405 * The second case is a special case - to more closely mimic the 1389 * The second case is a special case - to more closely mimic the
1406 * old behaviour - if your flying, your not walking - just 1390 * old behaviour - if your flying, your not walking - just
1409 if (move_type == 0) 1393 if (move_type == 0)
1410 move_type = MOVE_WALK; 1394 move_type = MOVE_WALK;
1411 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1395 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1412 move_type &= ~MOVE_WALK; 1396 move_type &= ~MOVE_WALK;
1413 1397
1414 if (speed != old_speed) 1398 // now apply the new move_type
1415 set_speed (speed); 1399 if (this->move_type != move_type)
1400 change_move_type (move_type);
1416 1401
1417 /* It is quite possible that a player's spell costing might have changed, 1402 /* It is quite possible that a player's spell costing might have changed,
1418 * so we will check that now. 1403 * so we will check that now.
1419 */ 1404 */
1420 if (type == PLAYER) 1405 if (is_player ())
1421 { 1406 contr->update_spells ();
1422 esrv_update_stats (contr);
1423 esrv_update_spells (contr);
1424 }
1425 1407
1426 // update the mapspace, if we are on a map 1408 // update the mapspace, if we are on a map
1427 if (!flag [FLAG_REMOVED] && map) 1409 if (!flag [FLAG_REMOVED] && map)
1428 map->at (x, y).flags_ = 0; 1410 map->at (x, y).flags_ = 0;
1411}
1412
1413void
1414object::set_glow_radius (sint8 rad)
1415{
1416 glow_radius = rad;
1417
1418 if (is_on_map ())
1419 update_all_los (map, x, y);
1420 else if (object *env = outer_env ())
1421 {
1422 env->update_stats ();
1423
1424 if (env->is_on_map ())
1425 update_all_los (env->map, env->x, env->y);
1426 }
1429} 1427}
1430 1428
1431/* 1429/*
1432 * Returns true if the given player is a legal class. 1430 * Returns true if the given player is a legal class.
1433 * The function to add and remove class-bonuses to the stats doesn't 1431 * The function to add and remove class-bonuses to the stats doesn't
1449 1447
1450/* 1448/*
1451 * set the new dragon name after gaining levels or 1449 * set the new dragon name after gaining levels or
1452 * changing ability focus (later this can be extended to 1450 * changing ability focus (later this can be extended to
1453 * eventually change the player's face and animation) 1451 * eventually change the player's face and animation)
1454 *
1455 * Note that the title is written to 'own_title' in the
1456 * player struct. This should be changed to 'ext_title'
1457 * as soon as clients support this!
1458 * Please, anyone, write support for 'ext_title'.
1459 */ 1452 */
1460void 1453void
1461set_dragon_name (object *pl, const object *abil, const object *skin) 1454set_dragon_name (object *pl, const object *abil, const object *skin)
1462{ 1455{
1463 int atnr = -1; /* attacknumber of highest level */ 1456 int atnr = -1; /* attacknumber of highest level */
1481 /* now if there are equals at highest level, pick the one with focus, 1474 /* now if there are equals at highest level, pick the one with focus,
1482 or else at random */ 1475 or else at random */
1483 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1476 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1484 atnr = abil->stats.exp; 1477 atnr = abil->stats.exp;
1485 1478
1486 level = (int) (level / 5.);
1487
1488 /* now set the new title */ 1479 /* now set the new title */
1489 if (pl->contr != NULL)
1490 {
1491 if (level == 0)
1492 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1480 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1493 else if (level == 1)
1494 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1481 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1495 else if (level == 2)
1496 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1482 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1497 else if (level == 3)
1498 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1483 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1499 else 1484 else
1500 { 1485 {
1501 /* special titles for extra high resistance! */ 1486 /* special titles for extra high resistance! */
1502 if (skin->resist[atnr] > 80)
1503 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1487 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1504 else if (skin->resist[atnr] > 50)
1505 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1488 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1506 else
1507 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1489 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1508 }
1509 } 1490 }
1510 1491
1511 strcpy (pl->contr->own_title, ""); 1492 strcpy (pl->contr->own_title, "");
1512} 1493}
1513 1494
1514/* 1495/*
1515 * This function is called when a dragon-player gains 1496 * This function is called when a dragon-player gains
1516 * an overall level. Here, the dragon might gain new abilities 1497 * an overall level. Here, the dragon might gain new abilities
1517 * or change the ability-focus. 1498 * or change the ability-focus.
1518 */ 1499 */
1519void 1500static void
1520dragon_level_gain (object *who) 1501dragon_level_gain (object *who)
1521{ 1502{
1522 object *abil = NULL; /* pointer to dragon ability force */ 1503 object *abil = NULL; /* pointer to dragon ability force */
1523 object *skin = NULL; /* pointer to dragon skin force */ 1504 object *skin = NULL; /* pointer to dragon skin force */
1524 object *tmp = NULL; /* tmp. object */ 1505 object *tmp = NULL; /* tmp. object */
1525 char buf[MAX_BUF]; /* tmp. string buffer */ 1506 char buf[MAX_BUF]; /* tmp. string buffer */
1526 1507
1527 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1508 /* now grab the 'dragon_ability'-forces from the player's inventory */
1528 shstr_cmp dragon_ability_force ("dragon_ability_force");
1529 shstr_cmp dragon_skin_force ("dragon_skin_force");
1530
1531 for (tmp = who->inv; tmp; tmp = tmp->below) 1509 for (tmp = who->inv; tmp; tmp = tmp->below)
1532 if (tmp->type == FORCE) 1510 if (tmp->type == FORCE)
1533 if (tmp->arch->name == dragon_ability_force) 1511 if (tmp->arch->archname == shstr_dragon_ability_force)
1534 abil = tmp; 1512 abil = tmp;
1535 else if (tmp->arch->name == dragon_skin_force) 1513 else if (tmp->arch->archname == shstr_dragon_skin_force)
1536 skin = tmp; 1514 skin = tmp;
1537 1515
1538 /* if the force is missing -> bail out */ 1516 /* if the force is missing -> bail out */
1539 if (abil == NULL) 1517 if (abil == NULL)
1540 return; 1518 return;
1583 object *skill_obj; 1561 object *skill_obj;
1584 1562
1585 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1563 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1586 if (!skill_obj) 1564 if (!skill_obj)
1587 { 1565 {
1588 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1566 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1589 return NULL; 1567 return NULL;
1590 } 1568 }
1569
1591 /* clear the flag - exp goes into this bucket, but player 1570 /* clear the flag - exp goes into this bucket, but player
1592 * still doesn't know it. 1571 * still doesn't know it.
1593 */ 1572 */
1594 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1573 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1595 skill_obj->stats.exp = 0; 1574 skill_obj->stats.exp = 0;
1596 skill_obj->level = 1; 1575 skill_obj->level = 1;
1597 insert_ob_in_ob (skill_obj, op); 1576 op->insert (skill_obj);
1598 1577
1599 if (op->contr) 1578 if (player *pl = op->contr)
1600 { 1579 pl->link_skills ();
1601 op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;
1602 if (op->contr->ns)
1603 op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1604 }
1605 1580
1606 return skill_obj; 1581 return skill_obj;
1607} 1582}
1608
1609 1583
1610/* player_lvl_adj() - for the new exp system. we are concerned with 1584/* player_lvl_adj() - for the new exp system. we are concerned with
1611 * whether the player gets more hp, sp and new levels. 1585 * whether the player gets more hp, sp and new levels.
1612 * Note this this function should only be called for players. Monstes 1586 * Note this this function should only be called for players. Monstes
1613 * don't really gain levels 1587 * don't really gain levels
1616 */ 1590 */
1617void 1591void
1618player_lvl_adj (object *who, object *op) 1592player_lvl_adj (object *who, object *op)
1619{ 1593{
1620 char buf[MAX_BUF]; 1594 char buf[MAX_BUF];
1595 bool changed = false;
1621 1596
1622 if (!op) /* when rolling stats */ 1597 if (!op) /* when rolling stats */
1623 op = who; 1598 op = who;
1624 1599
1625 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1600 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1626 { 1601 {
1602 changed = true;
1603
1627 op->level++; 1604 op->level++;
1628 1605
1629 if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1606 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1630 dragon_level_gain (who); 1607 dragon_level_gain (who);
1631 1608
1632 /* Only roll these if it is the player (who) that gained the level */ 1609 /* Only roll these if it is the player (who) that gained the level */
1633 if (op == who && (who->level < 11) && who->type == PLAYER) 1610 if (op == who && (who->level < 11) && who->type == PLAYER)
1634 { 1611 {
1635 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1612 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1636 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1613 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1637 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1614 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1638 } 1615 }
1639 1616
1640 who->update_stats ();
1641 if (op->level > 1) 1617 if (op->level > 1)
1642 { 1618 {
1643 if (op->type != PLAYER) 1619 if (op->type != PLAYER)
1620 {
1621 who->contr->play_sound (sound_find ("skill_up"));
1644 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);
1623 }
1645 else 1624 else
1625 {
1626 who->contr->play_sound (sound_find ("level_up"));
1646 sprintf (buf, "You are now level %d.", op->level); 1627 sprintf (buf, "You are now level %d.", op->level);
1628 }
1629
1647 if (who) 1630 if (who)
1648 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1631 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1649 } 1632 }
1650 player_lvl_adj (who, op); /* To increase more levels */
1651 } 1633 }
1634
1652 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1635 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1653 { 1636 {
1637 changed = true;
1638
1654 op->level--; 1639 op->level--;
1655 who->update_stats (); 1640
1656 if (op->type != PLAYER) 1641 if (op->type != PLAYER)
1657 { 1642 {
1658 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1643 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1659 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1644 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1660 } 1645 }
1661 player_lvl_adj (who, op); /* To decrease more levels */
1662 } 1646 }
1663 1647
1664 /* check if the spell data has changed */ 1648 if (changed)
1665 esrv_update_stats (who->contr); 1649 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1666 esrv_update_spells (who->contr);
1667} 1650}
1668 1651
1669/* 1652/*
1670 * Returns how much experience is needed for a player to become 1653 * Returns how much experience is needed for a player to become
1671 * the given level. level should really never exceed max_level 1654 * the given level. level should really never exceed max_level
1715 * flag is what to do if the player doesn't have the skill: 1698 * flag is what to do if the player doesn't have the skill:
1716 */ 1699 */
1717static void 1700static void
1718add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1701add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1719{ 1702{
1720 object *skill_obj = NULL; 1703 object *skill_obj;
1721 sint64 limit, exp_to_add; 1704 sint64 limit, exp_to_add;
1722 int i; 1705 int i;
1723 1706
1724 /* prevents some forms of abuse. */ 1707 /* prevents some forms of abuse. */
1725 if (op->contr->braced) 1708 if (op->contr->braced)
1728 /* Try to find the matching skill. 1711 /* Try to find the matching skill.
1729 * We do a shortcut/time saving mechanism first - see if it matches 1712 * We do a shortcut/time saving mechanism first - see if it matches
1730 * chosen_skill. This means we don't need to search through 1713 * chosen_skill. This means we don't need to search through
1731 * the players inventory. 1714 * the players inventory.
1732 */ 1715 */
1716 skill_obj = 0;
1717
1733 if (skill_name) 1718 if (skill_name)
1734 { 1719 {
1735 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1720 skill_obj = op->contr->find_skill (skill_name);
1736 skill_obj = op->chosen_skill;
1737 else
1738 {
1739 for (i = 0; i < NUM_SKILLS; i++)
1740 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1741 {
1742 skill_obj = op->contr->last_skill_ob[i];
1743 break;
1744 }
1745 1721
1746 /* Player doesn't have the skill. Check to see what to do, and give 1722 /* Player doesn't have the skill. Check to see what to do, and give
1747 * it to the player if necessary 1723 * it to the player if necessary
1748 */ 1724 */
1749 if (!skill_obj) 1725 if (!skill_obj)
1750 { 1726 {
1751 if (flag == SK_EXP_NONE) 1727 if (flag == SK_EXP_NONE)
1752 return; 1728 return;
1729
1753 else if (flag == SK_EXP_ADD_SKILL) 1730 if (flag == SK_EXP_ADD_SKILL)
1754 give_skill_by_name (op, skill_name); 1731 skill_obj = give_skill_by_name (op, skill_name);
1755 }
1756 } 1732 }
1757 } 1733 }
1758 1734
1759 if (flag != SK_EXP_SKILL_ONLY) 1735 if (flag != SK_EXP_SKILL_ONLY)
1760 { 1736 {
1793 player_lvl_adj (op, skill_obj); 1769 player_lvl_adj (op, skill_obj);
1794 } 1770 }
1795} 1771}
1796 1772
1797/* This function checks to make sure that object 'op' can 1773/* This function checks to make sure that object 'op' can
1798 * lost 'exp' experience. It returns the amount of exp 1774 * lose 'exp' experience. It returns the amount of exp
1799 * object 'op' can in fact lose - it basically makes 1775 * object 'op' can in fact lose - it basically makes
1800 * adjustments based on permanent exp and the like. 1776 * adjustments based on permanent exp and the like.
1801 * This function should always be used for losing experience - 1777 * This function should always be used for losing experience -
1802 * the 'exp' value passed should be positive - this is the 1778 * the 'exp' value passed should be positive - this is the
1803 * amount that should get subtract from the player. 1779 * amount that should get subtract from the player.
1804 */ 1780 */
1805sint64 1781static sint64
1806check_exp_loss (const object *op, sint64 exp) 1782check_exp_loss (const object *op, sint64 exp)
1807{ 1783{
1808 sint64 del_exp; 1784 sint64 del_exp;
1809 1785
1810 if (exp > op->stats.exp) 1786 if (exp > op->stats.exp)
1811 exp = op->stats.exp; 1787 exp = op->stats.exp;
1788
1812 if (settings.permanent_exp_ratio) 1789 if (settings.permanent_exp_ratio)
1813 { 1790 {
1814 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1791 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1792
1815 if (del_exp < 0) 1793 if (del_exp < 0)
1816 del_exp = 0; 1794 del_exp = 0;
1795
1817 if (exp > del_exp) 1796 if (exp > del_exp)
1818 exp = del_exp; 1797 exp = del_exp;
1819 } 1798 }
1799
1820 return exp; 1800 return exp;
1821} 1801}
1822 1802
1823sint64 1803sint64
1824check_exp_adjust (const object *op, sint64 exp) 1804check_exp_adjust (const object *op, sint64 exp)
1825{ 1805{
1826 if (exp < 0) 1806 if (exp < 0)
1827 return check_exp_loss (op, exp); 1807 return check_exp_loss (op, exp);
1828 else 1808 else
1829 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1809 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1830} 1810}
1831
1832 1811
1833/* Subtracts experience from player. 1812/* Subtracts experience from player.
1834 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1813 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1835 * only subtract from the matching skill. Otherwise, 1814 * only subtract from the matching skill. Otherwise,
1836 * this subtracts a portion from all 1815 * this subtracts a portion from all
1850 sint64 del_exp; 1829 sint64 del_exp;
1851 1830
1852 for (tmp = op->inv; tmp; tmp = tmp->below) 1831 for (tmp = op->inv; tmp; tmp = tmp->below)
1853 if (tmp->type == SKILL && tmp->stats.exp) 1832 if (tmp->type == SKILL && tmp->stats.exp)
1854 { 1833 {
1855 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1834 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1856 { 1835 {
1857 del_exp = check_exp_loss (tmp, exp); 1836 del_exp = check_exp_loss (tmp, exp);
1858 tmp->stats.exp -= del_exp; 1837 tmp->stats.exp -= del_exp;
1859 player_lvl_adj (op, tmp); 1838 player_lvl_adj (op, tmp);
1860 } 1839 }
1948 * amount of permenent experience, whichever gives the lowest loss. 1927 * amount of permenent experience, whichever gives the lowest loss.
1949 */ 1928 */
1950void 1929void
1951apply_death_exp_penalty (object *op) 1930apply_death_exp_penalty (object *op)
1952{ 1931{
1953 object *tmp;
1954 sint64 loss; 1932 sint64 loss;
1955 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1933 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1956 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1934 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1957 1935
1958 for (tmp = op->inv; tmp; tmp = tmp->below) 1936 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 if (tmp->type == SKILL && tmp->stats.exp) 1937 if (tmp->type == SKILL && tmp->stats.exp)
1960 { 1938 {
1961
1962 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1939 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1963 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1940 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1964 1941
1965 /* With the revised exp system, you can get cases where 1942 /* With the revised exp system, you can get cases where
1966 * losing several levels would still require that you have more 1943 * losing several levels would still require that you have more
1967 * exp than you currently have - this is true if the levels 1944 * exp than you currently have - this is true if the levels
1968 * tables is a lot harder. 1945 * tables is a lot harder.
1969 */ 1946 */
1970 if (level_loss < 0) 1947 if (level_loss < 0)
1971 level_loss = 0; 1948 level_loss = 0;
1972 1949
1973 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1950 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1974 1951
1975 tmp->stats.exp -= loss; 1952 tmp->stats.exp -= loss;
1976 player_lvl_adj (op, tmp); 1953 player_lvl_adj (op, tmp);
1977 } 1954 }
1978 1955
1979 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1956 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1980 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1957 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1958
1981 if (level_loss < 0) 1959 if (level_loss < 0)
1982 level_loss = 0; 1960 level_loss = 0;
1961
1983 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1962 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1984 1963
1985 op->stats.exp -= loss; 1964 op->stats.exp -= loss;
1986 player_lvl_adj (op, NULL); 1965 player_lvl_adj (op, NULL);
1987} 1966}
1988 1967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines