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.71 by elmex, Sat Jul 21 14:37:25 2007 UTC vs.
Revision 1.98 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h>
26 26
27/* 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
28 * 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
29 * 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
30 */ 30 */
… …
280 * that gives them that ability. 280 * that gives them that ability.
281 */ 281 */
282int 282int
283change_abil (object *op, object *tmp) 283change_abil (object *op, object *tmp)
284{ 284{
285 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0; 285 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
286 int success = 0;
286 char message[MAX_BUF]; 287 char message[MAX_BUF];
287 int potion_max = 0; 288 int potion_max = 0;
288 289
289 /* remember what object was like before it was changed. note that 290 // keep some stats for comparison purposes
290 * refop is a local copy of op only to be used for detecting changes 291 object::flags_t prev_flag = op->flag;
291 * found by update_stats. refop is not a real object 292 MoveType prev_move_type = op->move_type;
292 */ 293 sint16 prev_resist [NROFATTACKS]; // clumsy
293 object_copy refop = *op; 294 assert (sizeof (prev_resist) == sizeof (op->resist));
295 memcpy (prev_resist, op->resist, sizeof (prev_resist));
294 296
295 if (op->type == PLAYER) 297 if (op->type == PLAYER)
296 { 298 {
297 if (tmp->type == POTION) 299 if (tmp->type == POTION)
298 { 300 {
299 potion_max = 1; 301 potion_max = 1;
302
300 for (int j = 0; j < NUM_STATS; j++) 303 for (int j = 0; j < NUM_STATS; j++)
301 { 304 {
302 int ostat = op->contr->orig_stats.stat (j); 305 int ostat = op->contr->orig_stats.stat (j);
303 int i = tmp->stats.stat (j); 306 int i = tmp->stats.stat (j);
304 307
305 /* 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 */
306 int nstat = flag * i + ostat; 309 int nstat = flag * i + ostat;
307 310
308 /* Do some bounds checking. While I don't think any 311 /* Do some bounds checking. There is the potential for potions
309 * potions do so right now, there is the potential for potions
310 * 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
311 * to allow for that. 313 * to allow for that.
312 */ 314 */
313 if (nstat < 1 && i * flag < 0) 315 if (nstat < 1 && i * flag < 0)
314 nstat = 1; 316 nstat = 1;
… …
366 { 368 {
367 success = 1; 369 success = 1;
368 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.");
369 } 371 }
370 372
371 if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) 373 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
372 { 374 {
373 success = 1; 375 success = 1;
374 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.");
375 } 377 }
376 378
377 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])
378 { 380 {
379 success = 1; 381 success = 1;
380 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.");
381 } 383 }
382 384
383 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])
384 { 386 {
385 success = 1; 387 success = 1;
386 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.");
387 } 389 }
388 390
… …
390 * user has multiple items giving the same type appled like we 392 * user has multiple items giving the same type appled like we
391 * 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
392 * can be misleading (a little higher could be miscontrued from 394 * can be misleading (a little higher could be miscontrued from
393 * from fly high) 395 * from fly high)
394 */ 396 */
395 if (tmp->move_type && op->move_type != refop.move_type) 397 if (tmp->move_type && op->move_type != prev_move_type)
396 { 398 {
397 success = 1; 399 success = 1;
398 400
399 /* 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
400 * status doesn't make a difference if you are flying high 402 * status doesn't make a difference if you are flying high
401 */ 403 */
402 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))
403 { 405 {
404 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.");
405 } 407 }
406 408
407 if (tmp->move_type & MOVE_FLY_HIGH) 409 if (tmp->move_type & MOVE_FLY_HIGH)
408 { 410 {
409 /* double conditional - second case covers if you have move_fly_low - 411 /* double conditional - second case covers if you have move_fly_low -
… …
421 } 423 }
422 424
423 /* becoming UNDEAD... a special treatment for this flag. Only those not 425 /* becoming UNDEAD... a special treatment for this flag. Only those not
424 * originally undead may change their status 426 * originally undead may change their status
425 */ 427 */
426 if (!QUERY_FLAG (op->arch, FLAG_UNDEAD)) 428 if (!op->arch->flag [FLAG_UNDEAD])
427 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 429 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
428 { 430 {
429 success = 1; 431 success = 1;
430 if (flag > 0) 432 if (flag > 0)
431 { 433 {
432 op->race = "undead"; 434 op->race = "undead";
… …
437 op->race = op->arch->race; 439 op->race = op->arch->race;
438 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 440 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
439 } 441 }
440 } 442 }
441 443
442 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 444 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
443 { 445 {
444 success = 1; 446 success = 1;
445 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 447 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
446 } 448 }
447 449
448 if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS)) 450 if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
449 { 451 {
450 success = 1; 452 success = 1;
451 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 453 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
452 } 454 }
453 455
454 /* blinded you can tell if more blinded since blinded player has minimal 456 /* blinded you can tell if more blinded since blinded player has minimal
455 * vision 457 * vision
456 */ 458 */
457 if (QUERY_FLAG (tmp, FLAG_BLIND)) 459 if (tmp->flag [FLAG_BLIND])
458 { 460 {
459 success = 1; 461 success = 1;
460 if (flag > 0) 462 if (flag > 0)
461 { 463 {
462 if (QUERY_FLAG (op, FLAG_WIZ)) 464 if (op->flag [FLAG_WIZ])
463 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); 465 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
464 else 466 else
465 { 467 {
466 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 468 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
467 SET_FLAG (op, FLAG_BLIND); 469 SET_FLAG (op, FLAG_BLIND);
… …
469 op->contr->do_los = 1; 471 op->contr->do_los = 1;
470 } 472 }
471 } 473 }
472 else 474 else
473 { 475 {
474 if (QUERY_FLAG (op, FLAG_WIZ)) 476 if (op->flag [FLAG_WIZ])
475 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); 477 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
476 else 478 else
477 { 479 {
478 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 480 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
479 CLEAR_FLAG (op, FLAG_BLIND); 481 CLEAR_FLAG (op, FLAG_BLIND);
… …
481 op->contr->do_los = 1; 483 op->contr->do_los = 1;
482 } 484 }
483 } 485 }
484 } 486 }
485 487
486 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK)) 488 if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
487 { 489 {
488 success = 1; 490 success = 1;
489 if (op->type == PLAYER) 491 if (op->type == PLAYER)
490 op->contr->do_los = 1; 492 op->contr->do_los = 1;
491 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark."); 493 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
492 } 494 }
493 495
494 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 496 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
495 { 497 {
496 success = 1; 498 success = 1;
497 if (flag > 0) 499 if (flag > 0)
498 { 500 {
499 if (QUERY_FLAG (op, FLAG_WIZ)) 501 if (op->flag [FLAG_WIZ])
500 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer."); 502 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
501 else 503 else
502 { 504 {
503 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 505 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
504 if (op->type == PLAYER) 506 if (op->type == PLAYER)
505 op->contr->do_los = 1; 507 op->contr->do_los = 1;
506 } 508 }
507 } 509 }
508 else 510 else
509 { 511 {
510 if (QUERY_FLAG (op, FLAG_WIZ)) 512 if (op->flag [FLAG_WIZ])
511 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus."); 513 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
512 else 514 else
513 { 515 {
514 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid."); 516 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
515 if (op->type == PLAYER) 517 if (op->type == PLAYER)
… …
553 for (int i = 0; i < NROFATTACKS; i++) 555 for (int i = 0; i < NROFATTACKS; i++)
554 { 556 {
555 if (i == ATNR_PHYSICAL) 557 if (i == ATNR_PHYSICAL)
556 continue; /* Don't display about armour */ 558 continue; /* Don't display about armour */
557 559
558 if (op->resist[i] != refop.resist[i]) 560 if (op->resist [i] != prev_resist [i])
559 { 561 {
560 success = 1; 562 success = 1;
563
561 if (op->resist[i] > refop.resist[i]) 564 if (op->resist [i] > prev_resist [i])
562 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); 565 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
563 else 566 else
564 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); 567 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
565 568
566 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 569 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
567 } 570 }
568 } 571 }
569 572
570 if (!potion_max) 573 if (!potion_max)
571 {
572 for (int j = 0; j < NUM_STATS; j++) 574 for (int j = 0; j < NUM_STATS; j++)
573 {
574 if (int i = tmp->stats.stat (j)) 575 if (int i = tmp->stats.stat (j))
575 { 576 {
576 success = 1; 577 success = 1;
577 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 578 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
578 } 579 }
579 }
580 }
581 580
582 return success; 581 return success;
583} 582}
584 583
585/* 584/*
… …
703 sint8 v = arch->stats.stat (i); 702 sint8 v = arch->stats.stat (i);
704 stats.stat (i) += v; 703 stats.stat (i) += v;
705 contr->orig_stats.stat (i) += v; 704 contr->orig_stats.stat (i) += v;
706 } 705 }
707} 706}
707
708/* These are the items that currently can change digestion, regeneration,
709 * spell point recovery and mana point recovery. Seems sort of an arbitary
710 * list, but other items store other info into stats array.
711 */
712static struct digest_types : std::bitset<NUM_TYPES>
713{
714 digest_types ()
715 {
716 set (WEAPON);
717 set (BOW);
718 set (ARMOUR);
719 set (HELMET);
720 set (SHIELD);
721 set (RING);
722 set (BOOTS);
723 set (GLOVES);
724 set (AMULET);
725 set (GIRDLE);
726 set (BRACERS);
727 set (CLOAK);
728 set (DISEASE);
729 set (FORCE);
730 set (SKILL);
731 }
732} digest_types;
733
734static struct copy_flags : object::flags_t
735{
736 copy_flags ()
737 {
738 set (FLAG_LIFESAVE);
739 set (FLAG_REFL_SPELL);
740 set (FLAG_REFL_MISSILE);
741 set (FLAG_STEALTH);
742 set (FLAG_XRAYS);
743 set (FLAG_BLIND);
744 set (FLAG_SEE_IN_DARK);
745 }
746} copy_flags;
708 747
709/* 748/*
710 * Updates all abilities given by applied objects in the inventory 749 * Updates all abilities given by applied objects in the inventory
711 * of the given object. Note: This function works for both monsters 750 * of the given object. Note: This function works for both monsters
712 * and players; the "player" in the name is purely an archaic inheritance. 751 * and players; the "player" in the name is purely an archaic inheritance.
… …
717 * spell system split, grace points now added to system --peterm 756 * spell system split, grace points now added to system --peterm
718 */ 757 */
719void 758void
720object::update_stats () 759object::update_stats ()
721{ 760{
722 int i, j;
723 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; 761 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
724 int weapon_weight = 0, weapon_speed = 0; 762 int weapon_weight = 0, weapon_speed = 0;
725 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 763 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
726 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 764 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
727 object *grace_obj = NULL, *mana_obj = NULL, *tmp; 765 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
728 float old_speed = speed; 766 float old_speed = speed;
767 int stat_sum [NUM_STATS];
729 768
730 /* First task is to clear all the values back to their original values */ 769 /* First task is to clear all the values back to their original values */
731 if (type == PLAYER) 770 if (type == PLAYER)
732 { 771 {
733 for (i = 0; i < NUM_STATS; i++) 772 for (int i = 0; i < NUM_STATS; i++)
734 stats.stat (i) = contr->orig_stats.stat (i); 773 stat_sum [i] = contr->orig_stats.stat (i);
735 774
736 if (settings.spell_encumbrance == TRUE) 775 if (settings.spell_encumbrance == TRUE)
737 contr->encumbrance = 0; 776 contr->encumbrance = 0;
738 777
739 attacktype = 0; 778 attacktype = 0;
… …
777 /* initializing resistances from the values in player/monster's 816 /* initializing resistances from the values in player/monster's
778 * archetype clone 817 * archetype clone
779 */ 818 */
780 memcpy (&resist, &arch->resist, sizeof (resist)); 819 memcpy (&resist, &arch->resist, sizeof (resist));
781 820
782 for (i = 0; i < NROFATTACKS; i++) 821 for (int i = 0; i < NROFATTACKS; i++)
783 { 822 {
784 if (resist[i] > 0) 823 if (resist[i] > 0)
785 prot[i] = resist[i], vuln[i] = 0; 824 prot[i] = resist[i], vuln[i] = 0;
786 else 825 else
787 vuln[i] = -(resist[i]), prot[i] = 0; 826 vuln[i] = -(resist[i]), prot[i] = 0;
… …
799 * basically, if a server updates its max level, these playes may find 838 * basically, if a server updates its max level, these playes may find
800 * that their protection from physical goes down 839 * that their protection from physical goes down
801 */ 840 */
802 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 841 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
803 { 842 {
804 ac = MAX (-10, arch->stats.ac - level / 3); 843 ac = max (-10, arch->stats.ac - level / 3);
805 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 844 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
806 } 845 }
807 else 846 else
808 ac = arch->stats.ac; 847 ac = arch->stats.ac;
809 848
810 stats.luck = arch->stats.luck; 849 stats.luck = arch->stats.luck;
811 speed = arch->speed; 850 speed = arch->speed;
812
813 sint16 digestion = 0; // a local var to add digestion
814 851
815 /* OK - we've reset most all the objects attributes to sane values. 852 /* OK - we've reset most all the objects attributes to sane values.
816 * now go through and make adjustments for what the player has equipped. 853 * now go through and make adjustments for what the player has equipped.
817 */ 854 */
818 for (tmp = inv; tmp; tmp = tmp->below) 855 for (tmp = inv; tmp; tmp = tmp->below)
… …
822 * then calls this function. 859 * then calls this function.
823 */ 860 */
824 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 861 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
825 continue; 862 continue;
826 863
827 /* See note in map.c:update_position about making this additive
828 * since light sources are never applied, need to put check here.
829 */
830 if (tmp->glow_radius > glow_radius)
831 glow_radius = tmp->glow_radius; 864 glow_radius += tmp->glow_radius;
832 865
833 /* For some things, we don't care what is equipped */ 866 /* For some things, we don't care what is equipped */
834 if (tmp->type == SKILL) 867 if (tmp->type == SKILL)
835 { 868 {
836 /* Want to take the highest skill here. */ 869 /* Want to take the highest skill here. */
… …
849 else if (tmp->level > grace_obj->level) 882 else if (tmp->level > grace_obj->level)
850 grace_obj = tmp; 883 grace_obj = tmp;
851 } 884 }
852 } 885 }
853 886
854 /* Container objects are not meant to adjust a players, but other applied 887 /* Container objects are not meant to adjust players, but other applied
855 * objects need to make adjustments. 888 * objects need to make adjustments.
856 * This block should handle all player specific changes 889 * This block should handle all player specific changes
857 * The check for Praying is a bit of a hack - god given bonuses are put 890 * The check for Praying is a bit of a hack - god given bonuses are put
858 * in the praying skill, and the player should always get those. 891 * in the praying skill, and the player should always get those.
859 * It also means we need to put in additional checks for applied below, 892 * It also means we need to put in additional checks for applied below,
… …
875 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) 908 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
876 && !tmp->flag [FLAG_CURSED] 909 && !tmp->flag [FLAG_CURSED]
877 && !tmp->flag [FLAG_DAMNED]) 910 && !tmp->flag [FLAG_DAMNED])
878 continue; 911 continue;
879 912
880 for (i = 0; i < NUM_STATS; i++) 913 for (int i = 0; i < NUM_STATS; i++)
881 change_attr_value (&stats, i, tmp->stats.stat (i)); 914 stat_sum [i] = stat_sum [i] + tmp->stats.stat (i);
882 915
883 /* These are the items that currently can change digestion, regeneration, 916 if (digest_types [tmp->type])
884 * spell point recovery and mana point recovery. Seems sort of an arbitary
885 * list, but other items store other info into stats array.
886 */
887 if (tmp->type == WEAPON || tmp->type == BOW ||
888 tmp->type == ARMOUR || tmp->type == HELMET ||
889 tmp->type == SHIELD || tmp->type == RING ||
890 tmp->type == BOOTS || tmp->type == GLOVES ||
891 tmp->type == AMULET || tmp->type == GIRDLE ||
892 tmp->type == BRACERS || tmp->type == CLOAK ||
893 tmp->type == DISEASE || tmp->type == FORCE ||
894 tmp->type == SKILL)
895 { 917 {
896 digestion += tmp->stats.food; 918 contr->digestion += tmp->stats.food;
897 contr->gen_hp += tmp->stats.hp; 919 contr->gen_hp += tmp->stats.hp;
920 if (tmp->type != BOW) // ugly exception for bows
898 contr->gen_sp += tmp->stats.sp; 921 contr->gen_sp += tmp->stats.sp;
899 contr->gen_grace += tmp->stats.grace; 922 contr->gen_grace += tmp->stats.grace;
900 contr->gen_sp_armour += tmp->gen_sp_armour; 923 contr->gen_sp_armour += tmp->gen_sp_armour;
901 } 924 }
902 } /* if this is a player */ 925 } /* if this is a player */
903 else 926 else
… …
906 current_weapon = tmp; 929 current_weapon = tmp;
907 } 930 }
908 931
909 /* Update slots used for items */ 932 /* Update slots used for items */
910 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 933 if (QUERY_FLAG (tmp, FLAG_APPLIED))
911 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 934 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
912 slot[i].used += tmp->slot[i].info; 935 slot[i].used += tmp->slot[i].info;
913 936
914 if (tmp->type == SYMPTOM) 937 if (tmp->type == SYMPTOM)
915 {
916 speed_reduce_from_disease = tmp->last_sp / 100.f;
917
918 if (speed_reduce_from_disease == 0)
919 speed_reduce_from_disease = 1; 938 speed_reduce_from_disease =
920 } 939 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
921 940
922 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 941 /* Pos. and neg. protections are counted separate (-> pro/vuln).
923 * (Negative protections are calculated exactly like positive.) 942 * (Negative protections are calculated exactly like positive.)
924 * Resistance from potions are treated special as well. If there's 943 * Resistance from potions are treated special as well. If there's
925 * more than one potion-effect, the bigger prot.-value is taken. 944 * more than one potion-effect, the bigger prot.-value is taken.
926 */ 945 */
927 if (tmp->type != POTION) 946 if (tmp->type != POTION)
928 { 947 {
929 for (i = 0; i < NROFATTACKS; i++) 948 for (int i = 0; i < NROFATTACKS; i++)
930 { 949 {
931 /* Potential for cursed potions, in which case we just can use 950 /* Potential for cursed potions, in which case we just can use
932 * a straight MAX, as potion_resist is initialised to zero. 951 * a straight MAX, as potion_resist is initialised to zero.
933 */ 952 */
934 if (tmp->type == POTION_EFFECT) 953 if (tmp->type == POTION_EFFECT)
935 { 954 {
936 if (potion_resist[i]) 955 if (potion_resist[i])
937 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); 956 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
938 else 957 else
939 potion_resist[i] = tmp->resist[i]; 958 potion_resist[i] = tmp->resist[i];
940 } 959 }
941 else if (tmp->resist[i] > 0) 960 else if (tmp->resist[i] > 0)
942 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 961 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
… …
954 path_denied |= tmp->path_denied; 973 path_denied |= tmp->path_denied;
955 move_type |= tmp->move_type; 974 move_type |= tmp->move_type;
956 stats.luck += tmp->stats.luck; 975 stats.luck += tmp->stats.luck;
957 } 976 }
958 977
959 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 978 flag |= tmp->flag & copy_flags;
960 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
961 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
962 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
963 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
964 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
965 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
966 979
967 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD)) 980 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
968 SET_FLAG (this, FLAG_UNDEAD); 981 SET_FLAG (this, FLAG_UNDEAD);
969 982
970 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 983 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
… …
1122 else /* To nullify the below effect */ 1135 else /* To nullify the below effect */
1123 ac += tmp->stats.ac + tmp->magic; 1136 ac += tmp->stats.ac + tmp->magic;
1124 } 1137 }
1125 1138
1126 if (tmp->stats.wc) 1139 if (tmp->stats.wc)
1127 wc -= (tmp->stats.wc + tmp->magic); 1140 wc -= tmp->stats.wc + tmp->magic;
1128 1141
1129 if (tmp->stats.ac) 1142 if (tmp->stats.ac)
1130 ac -= (tmp->stats.ac + tmp->magic); 1143 ac -= tmp->stats.ac + tmp->magic;
1131 1144
1132 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max) 1145 if (ARMOUR_SPEED (tmp))
1133 max = ARMOUR_SPEED (tmp) / 10.f; 1146 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1134 1147
1135 break; 1148 break;
1136 } /* switch tmp->type */ 1149 } /* switch tmp->type */
1137 } /* item is equipped */ 1150 } /* item is equipped */
1138 } /* for loop of items */ 1151 } /* for loop of items */
1139 1152
1140 // now clamp digestion to our limits 1153 glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
1141 contr->digestion = clamp (digestion, MIN_DIGESTION, MAX_DIGESTION);
1142 1154
1143 /* We've gone through all the objects the player has equipped. For many things, we 1155 /* We've gone through all the objects the player has equipped. For many things, we
1144 * have generated intermediate values which we now need to assign. 1156 * have generated intermediate values which we now need to assign.
1145 */ 1157 */
1146 1158
… …
1148 * If there is an uncursed potion in effect, granting more protection 1160 * If there is an uncursed potion in effect, granting more protection
1149 * than that, we take: 'total resistance = resistance from potion'. 1161 * than that, we take: 'total resistance = resistance from potion'.
1150 * If there is a cursed (and no uncursed) potion in effect, we take 1162 * If there is a cursed (and no uncursed) potion in effect, we take
1151 * 'total resistance = vulnerability from cursed potion'. 1163 * 'total resistance = vulnerability from cursed potion'.
1152 */ 1164 */
1153 for (i = 0; i < NROFATTACKS; i++) 1165 for (int i = 0; i < NROFATTACKS; i++)
1154 { 1166 {
1155 resist[i] = prot[i] - vuln[i]; 1167 resist[i] = prot[i] - vuln[i];
1156 1168
1157 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1169 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0)))
1158 resist[i] = potion_resist[i]; 1170 resist[i] = potion_resist[i];
1159 } 1171 }
1160 1172
1161 /* Figure out the players sp/mana/hp totals. */
1162 if (type == PLAYER) 1173 if (type == PLAYER)
1163 { 1174 {
1175 // clamp various player stats
1176 for (int i = 0; i < NUM_STATS; ++i)
1177 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT);
1178
1179 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1180
1181 /* Figure out the players sp/mana/hp totals. */
1164 int pl_level; 1182 int pl_level;
1165 1183
1166 check_stat_bounds (&(stats)); 1184 check_stat_bounds (&(stats));
1167 pl_level = level; 1185 pl_level = level;
1168 1186
… …
1170 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1188 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */
1171 1189
1172 /* You basically get half a con bonus/level. But we do take into account rounding, 1190 /* You basically get half a con bonus/level. But we do take into account rounding,
1173 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1191 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1174 */ 1192 */
1175 for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) 1193 stats.maxhp = 0;
1194 for (int i = 1; i <= min (10, pl_level); i++)
1176 { 1195 {
1177 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1196 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1178 1197
1179 if (i % 2 && con_bonus[stats.Con] % 2) 1198 if (i % 2 && con_bonus[stats.Con] % 2)
1180 {
1181 if (con_bonus[stats.Con] > 0) 1199 if (con_bonus[stats.Con] > 0)
1182 j++; 1200 j++;
1183 else 1201 else
1184 j--; 1202 j--;
1185 }
1186 1203
1187 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ 1204 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1188 } 1205 }
1189 1206
1190 for (i = 11; i <= level; i++) 1207 stats.maxhp += 2 * max (0, level - 10);
1191 stats.maxhp += 2;
1192 1208
1193 if (stats.hp > stats.maxhp) 1209 if (stats.hp > stats.maxhp)
1194 stats.hp = stats.maxhp; 1210 stats.hp = stats.maxhp;
1195 1211
1196 /* Sp gain is controlled by the level of the player's 1212 /* Sp gain is controlled by the level of the player's
… …
1209 1225
1210 if (mana_obj == this && type == PLAYER) 1226 if (mana_obj == this && type == PLAYER)
1211 stats.maxsp = 1; 1227 stats.maxsp = 1;
1212 else 1228 else
1213 { 1229 {
1214 sp_tmp = 0.f; 1230 float sp_tmp = 0.f;
1215 1231
1216 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1232 for (int i = 1; i <= min (10, mana_obj->level); i++)
1217 { 1233 {
1218 float stmp; 1234 float stmp;
1219 1235
1220 /* Got some extra bonus at first level */ 1236 /* Got some extra bonus at first level */
1221 if (i < 2) 1237 if (i < 2)
1222 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f; 1238 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1223 else 1239 else
1224 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; 1240 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1225 1241
1226 if (stmp < 1.f)
1227 stmp = 1.f;
1228
1229 sp_tmp += stmp; 1242 sp_tmp += max (1.f, stmp);
1230 } 1243 }
1231 1244
1232 stats.maxsp = (sint16)sp_tmp; 1245 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1233
1234 for (i = 11; i <= mana_obj->level; i++)
1235 stats.maxsp += 2;
1236 } 1246 }
1237 1247
1238 /* Characters can get their sp supercharged via rune of transferrance */ 1248 /* Characters can get their sp supercharged via rune of transferrance */
1239 if (stats.sp > stats.maxsp * 2) 1249 stats.sp = min (stats.sp, stats.maxsp * 2);
1240 stats.sp = stats.maxsp * 2;
1241 1250
1242 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ 1251 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1243 if (!grace_obj || !grace_obj->level || type != PLAYER) 1252 if (!grace_obj || !grace_obj->level || type != PLAYER)
1244 grace_obj = this; 1253 grace_obj = this;
1245 1254
… …
1250 /* store grace in a float - this way, the divisions below don't create 1259 /* store grace in a float - this way, the divisions below don't create
1251 * big jumps when you go from level to level - with int's, it then 1260 * big jumps when you go from level to level - with int's, it then
1252 * becomes big jumps when the sums of the bonuses jump to the next 1261 * becomes big jumps when the sums of the bonuses jump to the next
1253 * step of 8 - with floats, even fractional ones are useful. 1262 * step of 8 - with floats, even fractional ones are useful.
1254 */ 1263 */
1255 sp_tmp = 0.f; 1264 float sp_tmp = 0.f;
1256 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1265
1266 for (int i = 1; i <= min (10, grace_obj->level); i++)
1257 { 1267 {
1258 float grace_tmp = 0.f; 1268 float grace_tmp = 0.f;
1259 1269
1260 /* Got some extra bonus at first level */ 1270 /* Got some extra bonus at first level */
1261 if (i < 2) 1271 if (i < 2)
1262 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f; 1272 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1263 else 1273 else
1264 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; 1274 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1265 1275
1266 if (grace_tmp < 1.f)
1267 grace_tmp = 1.f;
1268
1269 sp_tmp += grace_tmp; 1276 sp_tmp += max (1.f, grace_tmp);
1270 } 1277 }
1271 1278
1272 stats.maxgrace = (sint16)sp_tmp;
1273
1274 /* two grace points per level after 11 */ 1279 /* two grace points per level after 10 */
1275 for (i = 11; i <= grace_obj->level; i++) 1280 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1276 stats.maxgrace += 2;
1277 } 1281 }
1278 1282
1279 /* No limit on grace vs maxgrace */ 1283 /* No limit on grace vs maxgrace */
1280 1284
1281 if (contr->braced) 1285 if (contr->braced)
… …
1301 1305
1302 if (contr && wc_obj && wc_obj->level > 1) 1306 if (contr && wc_obj && wc_obj->level > 1)
1303 { 1307 {
1304 wc -= wc_obj->level + thaco_bonus[stats.Str]; 1308 wc -= wc_obj->level + thaco_bonus[stats.Str];
1305 1309
1306 for (i = 1; i < wc_obj->level; i++) 1310 for (int i = 1; i < wc_obj->level; i++)
1307 { 1311 {
1308 /* additional wc every 6 levels */ 1312 /* additional wc every 6 levels */
1309 if (!(i % 6)) 1313 if (!(i % 6))
1310 wc--; 1314 wc--;
1311 1315
… …
1324 1328
1325 speed = 1.f + speed_bonus[stats.Dex]; 1329 speed = 1.f + speed_bonus[stats.Dex];
1326 1330
1327 if (settings.search_items && contr->search_str[0]) 1331 if (settings.search_items && contr->search_str[0])
1328 speed -= 1; 1332 speed -= 1;
1329
1330 if (attacktype == 0)
1331 attacktype = arch->attacktype;
1332 } /* End if player */ 1333 } /* End if player */
1333 1334
1334 if (added_speed >= 0) 1335 if (added_speed >= 0)
1335 speed += added_speed / 10.f; 1336 speed += added_speed / 10.f;
1336 else /* Something wrong here...: */ 1337 else /* Something wrong here...: */
1337 speed /= 1.f - added_speed; 1338 speed /= 1.f - added_speed;
1338 1339
1339 /* Max is determined by armour */ 1340 /* Max is determined by armour */
1340 if (speed > max) 1341 speed = min (speed, max_speed);
1341 speed = max;
1342 1342
1343 if (type == PLAYER) 1343 if (type == PLAYER)
1344 { 1344 {
1345 /* f is a number the represents the number of kg above (positive num) 1345 /* f is a number the represents the number of kg above (positive num)
1346 * or below (negative number) that the player is carrying. If above 1346 * or below (negative number) that the player is carrying. If above
1347 * weight limit, then player suffers a speed reduction based on how 1347 * weight limit, then player suffers a speed reduction based on how
1348 * much above he is, and what is max carry is 1348 * much above he is, and what is max carry is
1349 */ 1349 */
1350 f = (carrying / 1000) - max_carry[stats.Str]; 1350 float f = (carrying / 1000) - max_carry[stats.Str];
1351 if (f > 0) 1351 if (f > 0.f)
1352 speed = speed / (1.f + f / max_carry[stats.Str]); 1352 speed = speed / (1.f + f / max_carry[stats.Str]);
1353 } 1353 }
1354 1354
1355 speed += bonus_speed / 10.f; /* Not affected by limits */ 1355 speed += bonus_speed / 10.f; /* Not affected by limits */
1356 speed *= speed_reduce_from_disease;
1356 1357
1357 /* Put a lower limit on speed. Note with this speed, you move once every 1358 /* Put a lower limit on speed. Note with this speed, you move once every
1358 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1359 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1359 */ 1360 */
1360 speed = speed * speed_reduce_from_disease;
1361
1362 if (speed < 0.01f && type == PLAYER) 1361 if (speed < 0.04f && type == PLAYER)
1363 speed = 0.01f; 1362 speed = 0.04f;
1363
1364 if (speed != old_speed)
1365 set_speed (speed);
1364 1366
1365 if (type == PLAYER) 1367 if (type == PLAYER)
1366 { 1368 {
1367 /* (This formula was made by vidarl@ifi.uio.no) 1369 /* (This formula was made by vidarl@ifi.uio.no)
1368 * Note that we never used these values again - basically 1370 * Note that we never used these values again - basically
… …
1400 if (move_type == 0) 1402 if (move_type == 0)
1401 move_type = MOVE_WALK; 1403 move_type = MOVE_WALK;
1402 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1404 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1403 move_type &= ~MOVE_WALK; 1405 move_type &= ~MOVE_WALK;
1404 1406
1405 if (speed != old_speed)
1406 set_speed (speed);
1407
1408 /* It is quite possible that a player's spell costing might have changed, 1407 /* It is quite possible that a player's spell costing might have changed,
1409 * so we will check that now. 1408 * so we will check that now.
1410 */ 1409 */
1411 if (type == PLAYER) 1410 if (type == PLAYER)
1412 { 1411 {
… …
1415 } 1414 }
1416 1415
1417 // update the mapspace, if we are on a map 1416 // update the mapspace, if we are on a map
1418 if (!flag [FLAG_REMOVED] && map) 1417 if (!flag [FLAG_REMOVED] && map)
1419 map->at (x, y).flags_ = 0; 1418 map->at (x, y).flags_ = 0;
1419}
1420
1421void
1422object::set_glow_radius (sint8 rad)
1423{
1424 glow_radius = rad;
1425
1426 if (is_on_map ())
1427 update_all_los (map, x, y);
1428 else if (object *env = outer_env ())
1429 {
1430 env->update_stats ();
1431
1432 if (env->is_on_map ())
1433 update_all_los (env->map, env->x, env->y);
1434 }
1420} 1435}
1421 1436
1422/* 1437/*
1423 * Returns true if the given player is a legal class. 1438 * Returns true if the given player is a legal class.
1424 * The function to add and remove class-bonuses to the stats doesn't 1439 * The function to add and remove class-bonuses to the stats doesn't
… …
1440 1455
1441/* 1456/*
1442 * set the new dragon name after gaining levels or 1457 * set the new dragon name after gaining levels or
1443 * changing ability focus (later this can be extended to 1458 * changing ability focus (later this can be extended to
1444 * eventually change the player's face and animation) 1459 * eventually change the player's face and animation)
1445 *
1446 * Note that the title is written to 'own_title' in the
1447 * player struct. This should be changed to 'ext_title'
1448 * as soon as clients support this!
1449 * Please, anyone, write support for 'ext_title'.
1450 */ 1460 */
1451void 1461void
1452set_dragon_name (object *pl, const object *abil, const object *skin) 1462set_dragon_name (object *pl, const object *abil, const object *skin)
1453{ 1463{
1454 int atnr = -1; /* attacknumber of highest level */ 1464 int atnr = -1; /* attacknumber of highest level */
… …
1472 /* now if there are equals at highest level, pick the one with focus, 1482 /* now if there are equals at highest level, pick the one with focus,
1473 or else at random */ 1483 or else at random */
1474 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1484 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1475 atnr = abil->stats.exp; 1485 atnr = abil->stats.exp;
1476 1486
1477 level = (int) (level / 5.);
1478
1479 /* now set the new title */ 1487 /* now set the new title */
1480 if (pl->contr != NULL)
1481 {
1482 if (level == 0)
1483 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1488 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1484 else if (level == 1)
1485 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1489 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1486 else if (level == 2)
1487 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1490 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1488 else if (level == 3)
1489 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1491 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1490 else 1492 else
1491 { 1493 {
1492 /* special titles for extra high resistance! */ 1494 /* special titles for extra high resistance! */
1493 if (skin->resist[atnr] > 80)
1494 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1495 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1495 else if (skin->resist[atnr] > 50)
1496 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1496 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1497 else
1498 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1497 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1499 }
1500 } 1498 }
1501 1499
1502 strcpy (pl->contr->own_title, ""); 1500 strcpy (pl->contr->own_title, "");
1503} 1501}
1504 1502
… …
1571 object *skill_obj; 1569 object *skill_obj;
1572 1570
1573 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1571 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1574 if (!skill_obj) 1572 if (!skill_obj)
1575 { 1573 {
1576 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1574 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1577 return NULL; 1575 return NULL;
1578 } 1576 }
1579 1577
1580 /* clear the flag - exp goes into this bucket, but player 1578 /* clear the flag - exp goes into this bucket, but player
1581 * still doesn't know it. 1579 * still doesn't know it.
1582 */ 1580 */
1583 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1581 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1584 skill_obj->stats.exp = 0; 1582 skill_obj->stats.exp = 0;
1585 skill_obj->level = 1; 1583 skill_obj->level = 1;
1586 insert_ob_in_ob (skill_obj, op); 1584 op->insert (skill_obj);
1587 1585
1588 if (player *pl = op->contr) 1586 if (player *pl = op->contr)
1589 { 1587 pl->link_skills ();
1590 pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1591 if (pl->ns)
1592 pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1593 }
1594 1588
1595 return skill_obj; 1589 return skill_obj;
1596} 1590}
1597 1591
1598/* player_lvl_adj() - for the new exp system. we are concerned with 1592/* player_lvl_adj() - for the new exp system. we are concerned with
… …
1604 */ 1598 */
1605void 1599void
1606player_lvl_adj (object *who, object *op) 1600player_lvl_adj (object *who, object *op)
1607{ 1601{
1608 char buf[MAX_BUF]; 1602 char buf[MAX_BUF];
1603 bool changed = false;
1609 1604
1610 if (!op) /* when rolling stats */ 1605 if (!op) /* when rolling stats */
1611 op = who; 1606 op = who;
1612 1607
1613 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1608 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1614 { 1609 {
1610 changed = true;
1611
1615 op->level++; 1612 op->level++;
1616 1613
1617 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1614 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1618 dragon_level_gain (who); 1615 dragon_level_gain (who);
1619 1616
… …
1623 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1620 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1624 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1621 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1625 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1622 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1626 } 1623 }
1627 1624
1628 who->update_stats ();
1629 if (op->level > 1) 1625 if (op->level > 1)
1630 { 1626 {
1631 if (op->type != PLAYER) 1627 if (op->type != PLAYER)
1628 {
1629 who->contr->play_sound (sound_find ("skill_up"));
1632 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1630 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1631 }
1633 else 1632 else
1633 {
1634 who->contr->play_sound (sound_find ("level_up"));
1634 sprintf (buf, "You are now level %d.", op->level); 1635 sprintf (buf, "You are now level %d.", op->level);
1636 }
1635 1637
1636 if (who) 1638 if (who)
1637 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1639 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1638 } 1640 }
1639
1640 player_lvl_adj (who, op); /* To increase more levels */
1641 } 1641 }
1642
1642 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1643 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1643 { 1644 {
1645 changed = true;
1646
1644 op->level--; 1647 op->level--;
1645 who->update_stats ();
1646 1648
1647 if (op->type != PLAYER) 1649 if (op->type != PLAYER)
1648 { 1650 {
1649 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1651 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1650 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1652 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1651 } 1653 }
1654 }
1652 1655
1653 player_lvl_adj (who, op); /* To decrease more levels */ 1656 if (changed)
1654 } 1657 {
1655 1658 who->update_stats ();
1659 esrv_update_stats (who->contr);
1656 /* check if the spell data has changed */ 1660 /* check if the spell data has changed */
1657 esrv_update_stats (who->contr);
1658 esrv_update_spells (who->contr); 1661 esrv_update_spells (who->contr);
1662 }
1659} 1663}
1660 1664
1661/* 1665/*
1662 * Returns how much experience is needed for a player to become 1666 * Returns how much experience is needed for a player to become
1663 * the given level. level should really never exceed max_level 1667 * the given level. level should really never exceed max_level
… …
1707 * flag is what to do if the player doesn't have the skill: 1711 * flag is what to do if the player doesn't have the skill:
1708 */ 1712 */
1709static void 1713static void
1710add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1714add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1711{ 1715{
1712 object *skill_obj = NULL; 1716 object *skill_obj;
1713 sint64 limit, exp_to_add; 1717 sint64 limit, exp_to_add;
1714 int i; 1718 int i;
1715 1719
1716 /* prevents some forms of abuse. */ 1720 /* prevents some forms of abuse. */
1717 if (op->contr->braced) 1721 if (op->contr->braced)
… …
1720 /* Try to find the matching skill. 1724 /* Try to find the matching skill.
1721 * We do a shortcut/time saving mechanism first - see if it matches 1725 * We do a shortcut/time saving mechanism first - see if it matches
1722 * chosen_skill. This means we don't need to search through 1726 * chosen_skill. This means we don't need to search through
1723 * the players inventory. 1727 * the players inventory.
1724 */ 1728 */
1729 skill_obj = 0;
1730
1725 if (skill_name) 1731 if (skill_name)
1726 { 1732 {
1727 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1733 skill_obj = op->contr->find_skill (skill_name);
1728 skill_obj = op->chosen_skill;
1729 else
1730 {
1731 for (i = 0; i < NUM_SKILLS; i++)
1732 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1733 {
1734 skill_obj = op->contr->last_skill_ob[i];
1735 break;
1736 }
1737 1734
1738 /* Player doesn't have the skill. Check to see what to do, and give 1735 /* Player doesn't have the skill. Check to see what to do, and give
1739 * it to the player if necessary 1736 * it to the player if necessary
1740 */ 1737 */
1741 if (!skill_obj) 1738 if (!skill_obj)
1742 { 1739 {
1743 if (flag == SK_EXP_NONE) 1740 if (flag == SK_EXP_NONE)
1744 return; 1741 return;
1742
1745 else if (flag == SK_EXP_ADD_SKILL) 1743 if (flag == SK_EXP_ADD_SKILL)
1746 give_skill_by_name (op, skill_name); 1744 skill_obj = give_skill_by_name (op, skill_name);
1747 }
1748 } 1745 }
1749 } 1746 }
1750 1747
1751 if (flag != SK_EXP_SKILL_ONLY) 1748 if (flag != SK_EXP_SKILL_ONLY)
1752 { 1749 {
… …
1785 player_lvl_adj (op, skill_obj); 1782 player_lvl_adj (op, skill_obj);
1786 } 1783 }
1787} 1784}
1788 1785
1789/* This function checks to make sure that object 'op' can 1786/* This function checks to make sure that object 'op' can
1790 * lost 'exp' experience. It returns the amount of exp 1787 * lose 'exp' experience. It returns the amount of exp
1791 * object 'op' can in fact lose - it basically makes 1788 * object 'op' can in fact lose - it basically makes
1792 * adjustments based on permanent exp and the like. 1789 * adjustments based on permanent exp and the like.
1793 * This function should always be used for losing experience - 1790 * This function should always be used for losing experience -
1794 * the 'exp' value passed should be positive - this is the 1791 * the 'exp' value passed should be positive - this is the
1795 * amount that should get subtract from the player. 1792 * amount that should get subtract from the player.
… …
1799{ 1796{
1800 sint64 del_exp; 1797 sint64 del_exp;
1801 1798
1802 if (exp > op->stats.exp) 1799 if (exp > op->stats.exp)
1803 exp = op->stats.exp; 1800 exp = op->stats.exp;
1801
1804 if (settings.permanent_exp_ratio) 1802 if (settings.permanent_exp_ratio)
1805 { 1803 {
1806 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1804 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1805
1807 if (del_exp < 0) 1806 if (del_exp < 0)
1808 del_exp = 0; 1807 del_exp = 0;
1808
1809 if (exp > del_exp) 1809 if (exp > del_exp)
1810 exp = del_exp; 1810 exp = del_exp;
1811 } 1811 }
1812
1812 return exp; 1813 return exp;
1813} 1814}
1814 1815
1815sint64 1816sint64
1816check_exp_adjust (const object *op, sint64 exp) 1817check_exp_adjust (const object *op, sint64 exp)
1817{ 1818{
1818 if (exp < 0) 1819 if (exp < 0)
1819 return check_exp_loss (op, exp); 1820 return check_exp_loss (op, exp);
1820 else 1821 else
1821 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1822 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1822} 1823}
1823
1824 1824
1825/* Subtracts experience from player. 1825/* Subtracts experience from player.
1826 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1826 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1827 * only subtract from the matching skill. Otherwise, 1827 * only subtract from the matching skill. Otherwise,
1828 * this subtracts a portion from all 1828 * this subtracts a portion from all
… …
1842 sint64 del_exp; 1842 sint64 del_exp;
1843 1843
1844 for (tmp = op->inv; tmp; tmp = tmp->below) 1844 for (tmp = op->inv; tmp; tmp = tmp->below)
1845 if (tmp->type == SKILL && tmp->stats.exp) 1845 if (tmp->type == SKILL && tmp->stats.exp)
1846 { 1846 {
1847 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1847 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1848 { 1848 {
1849 del_exp = check_exp_loss (tmp, exp); 1849 del_exp = check_exp_loss (tmp, exp);
1850 tmp->stats.exp -= del_exp; 1850 tmp->stats.exp -= del_exp;
1851 player_lvl_adj (op, tmp); 1851 player_lvl_adj (op, tmp);
1852 } 1852 }
… …
1940 * amount of permenent experience, whichever gives the lowest loss. 1940 * amount of permenent experience, whichever gives the lowest loss.
1941 */ 1941 */
1942void 1942void
1943apply_death_exp_penalty (object *op) 1943apply_death_exp_penalty (object *op)
1944{ 1944{
1945 object *tmp;
1946 sint64 loss; 1945 sint64 loss;
1947 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1946 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1948 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1947 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1949 1948
1950 for (tmp = op->inv; tmp; tmp = tmp->below) 1949 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1951 if (tmp->type == SKILL && tmp->stats.exp) 1950 if (tmp->type == SKILL && tmp->stats.exp)
1952 { 1951 {
1953
1954 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1952 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1955 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1953 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)];
1956 1954
1957 /* With the revised exp system, you can get cases where 1955 /* With the revised exp system, you can get cases where
1958 * losing several levels would still require that you have more 1956 * losing several levels would still require that you have more
… …
1960 * tables is a lot harder. 1958 * tables is a lot harder.
1961 */ 1959 */
1962 if (level_loss < 0) 1960 if (level_loss < 0)
1963 level_loss = 0; 1961 level_loss = 0;
1964 1962
1965 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1963 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1966 1964
1967 tmp->stats.exp -= loss; 1965 tmp->stats.exp -= loss;
1968 player_lvl_adj (op, tmp); 1966 player_lvl_adj (op, tmp);
1969 } 1967 }
1970 1968
1971 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1969 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1972 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1970 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1973 1971
1974 if (level_loss < 0) 1972 if (level_loss < 0)
1975 level_loss = 0; 1973 level_loss = 0;
1974
1976 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1975 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1977 1976
1978 op->stats.exp -= loss; 1977 op->stats.exp -= loss;
1979 player_lvl_adj (op, NULL); 1978 player_lvl_adj (op, NULL);
1980} 1979}
1981 1980

Diff Legend

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