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.87 by root, Tue May 6 17:31:21 2008 UTC vs.
Revision 1.119 by root, Thu Apr 15 04:56:46 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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 <support@deliantra.net> 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>
… …
138/* 139/*
139 Since this is nowhere defined ... 140 Since this is nowhere defined ...
140 Both come in handy at least in function add_exp() 141 Both come in handy at least in function add_exp()
141*/ 142*/
142 143
143#define MAX_EXPERIENCE levels[settings.max_level] 144#define MAX_EXPERIENCE levels [settings.max_level]
144 145
145/* because exp_obj sum to make the total score, 146/* because exp_obj sum to make the total score,
146 * we cannot allow that sum to exceed the maximum 147 * we cannot allow that sum to exceed the maximum
147 * amount of experience a player can gain. Thus 148 * amount of experience a player can gain. Thus
148 * we define MAX_EXP_IN_OBJ. It is important to try 149 * we define MAX_EXP_IN_OBJ. It is important to try
… …
155 * line with progression of previous levels, so 156 * line with progression of previous levels, so
156 * if more levels are desired, this should be fixed. 157 * if more levels are desired, this should be fixed.
157 * -b.t. 158 * -b.t.
158 */ 159 */
159 160
160#define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1) 161#define MAX_EXP_IN_OBJ MAX_EXP_IN_OBJ / (MAX_EXP_CAT - 1)
161
162extern sint64 *levels;
163 162
164#define MAX_SAVE_LEVEL 110 163#define MAX_SAVE_LEVEL 110
165 164
166/* This no longer needs to be changed anytime the number of 165/* This no longer needs to be changed anytime the number of
167 * levels is increased - rather, did_make_save will do the 166 * levels is increased - rather, did_make_save will do the
… …
261/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, 260/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
262 * make this macro to clean those up. Not usuable outside change_abil 261 * make this macro to clean those up. Not usuable outside change_abil
263 * function since some of the values passed to new_draw_info are hardcoded. 262 * function since some of the values passed to new_draw_info are hardcoded.
264 */ 263 */
265#define DIFF_MSG(flag, msg1, msg2) \ 264#define DIFF_MSG(flag, msg1, msg2) \
266 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 265 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
267 266
268/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */ 267/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
269 268
270/* flag is set to 1 if we are applying the object, -1 if we are removing 269/* flag is set to 1 if we are applying the object, -1 if we are removing
271 * the object. 270 * the object.
… …
414 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); 413 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
415 } 414 }
416 415
417 if (tmp->move_type & MOVE_SWIM) 416 if (tmp->move_type & MOVE_SWIM)
418 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 417 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 } 418 }
423 419
424 /* becoming UNDEAD... a special treatment for this flag. Only those not 420 /* becoming UNDEAD... a special treatment for this flag. Only those not
425 * originally undead may change their status 421 * originally undead may change their status
426 */ 422 */
… …
463 if (op->flag [FLAG_WIZ]) 459 if (op->flag [FLAG_WIZ])
464 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); 460 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
465 else 461 else
466 { 462 {
467 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 463 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
468 SET_FLAG (op, FLAG_BLIND); 464 op->set_flag (FLAG_BLIND);
469 if (op->type == PLAYER) 465 if (op->type == PLAYER)
470 op->contr->do_los = 1; 466 op->contr->do_los = 1;
471 } 467 }
472 } 468 }
473 else 469 else
… …
475 if (op->flag [FLAG_WIZ]) 471 if (op->flag [FLAG_WIZ])
476 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); 472 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
477 else 473 else
478 { 474 {
479 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 475 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
480 CLEAR_FLAG (op, FLAG_BLIND); 476 op->clr_flag (FLAG_BLIND);
481 if (op->type == PLAYER) 477 if (op->type == PLAYER)
482 op->contr->do_los = 1; 478 op->contr->do_los = 1;
483 } 479 }
484 } 480 }
485 } 481 }
… …
523 { 519 {
524 success = 1; 520 success = 1;
525 DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky."); 521 DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky.");
526 } 522 }
527 523
524 if (digest_types [tmp->type])
525 {
528 if (tmp->stats.hp && op->type == PLAYER) 526 if (tmp->stats.hp && op->type == PLAYER)
529 { 527 {
530 success = 1; 528 success = 1;
531 DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!"); 529 DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!");
532 } 530 }
533 531
534 if (tmp->stats.sp && op->type == PLAYER && tmp->type != SKILL) 532 if (tmp->stats.sp && op->type == PLAYER
535 { 533 && tmp->type != SKILL && tmp->type != BOW)
534 {
536 success = 1; 535 success = 1;
537 DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane."); 536 DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane.");
538 } 537 }
539 538
540 /* for the future when artifacts set this -b.t. */ 539 /* for the future when artifacts set this -b.t. */
541 if (tmp->stats.grace && op->type == PLAYER) 540 if (tmp->stats.grace && op->type == PLAYER)
542 { 541 {
543 success = 1; 542 success = 1;
544 DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy."); 543 DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy.");
545 } 544 }
546 545
547 if (tmp->stats.food && op->type == PLAYER) 546 if (tmp->stats.food && op->type == PLAYER)
548 { 547 {
549 success = 1; 548 success = 1;
550 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); 549 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
550 }
551 } 551 }
552 552
553 /* Messages for changed resistance */ 553 /* Messages for changed resistance */
554 for (int i = 0; i < NROFATTACKS; i++) 554 for (int i = 0; i < NROFATTACKS; i++)
555 { 555 {
… …
594object::drain_specific_stat (int deplete_stats) 594object::drain_specific_stat (int deplete_stats)
595{ 595{
596 object *tmp; 596 object *tmp;
597 archetype *at; 597 archetype *at;
598 598
599 at = archetype::find (ARCH_DEPLETION); 599 at = archetype::find (shstr_depletion);
600 if (!at) 600 if (!at)
601 { 601 {
602 LOG (llevError, "Couldn't find archetype depletion.\n"); 602 LOG (llevError, "Couldn't find archetype depletion.\n");
603 return; 603 return;
604 } 604 }
… …
606 { 606 {
607 tmp = present_arch_in_ob (at, this); 607 tmp = present_arch_in_ob (at, this);
608 608
609 if (!tmp) 609 if (!tmp)
610 { 610 {
611 tmp = arch_to_object (at); 611 tmp = at->instance ();
612 tmp = insert_ob_in_ob (tmp, this); 612 tmp = insert_ob_in_ob (tmp, this);
613 SET_FLAG (tmp, FLAG_APPLIED); 613 tmp->set_flag (FLAG_APPLIED);
614 } 614 }
615 } 615 }
616 616
617 new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]); 617 new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);
618 change_attr_value (&tmp->stats, deplete_stats, -1); 618 change_attr_value (&tmp->stats, deplete_stats, -1);
… …
624 * via an applied bad_luck object. 624 * via an applied bad_luck object.
625 */ 625 */
626void 626void
627object::change_luck (int value) 627object::change_luck (int value)
628{ 628{
629 archetype *at = archetype::find ("luck"); 629 archetype *at = archetype::find (shstr_luck);
630 if (!at) 630 if (!at)
631 LOG (llevError, "Couldn't find archetype luck.\n"); 631 LOG (llevError, "Couldn't find archetype luck.\n");
632 else 632 else
633 { 633 {
634 object *tmp = present_arch_in_ob (at, this); 634 object *tmp = present_arch_in_ob (at, this);
… …
636 if (!tmp) 636 if (!tmp)
637 { 637 {
638 if (!value) 638 if (!value)
639 return; 639 return;
640 640
641 tmp = arch_to_object (at); 641 tmp = at->instance ();
642 tmp = insert_ob_in_ob (tmp, this); 642 tmp = insert_ob_in_ob (tmp, this);
643 SET_FLAG (tmp, FLAG_APPLIED); 643 tmp->set_flag (FLAG_APPLIED);
644 } 644 }
645 645
646 if (value) 646 if (value)
647 { 647 {
648 /* Limit the luck value of the bad luck object to +/-100. This 648 /* Limit the luck value of the bad luck object to +/-100. This
… …
701 sint8 v = arch->stats.stat (i); 701 sint8 v = arch->stats.stat (i);
702 stats.stat (i) += v; 702 stats.stat (i) += v;
703 contr->orig_stats.stat (i) += v; 703 contr->orig_stats.stat (i) += v;
704 } 704 }
705} 705}
706
707/* These are the items that currently can change digestion, regeneration,
708 * spell point recovery and mana point recovery. Seems sort of an arbitary
709 * list, but other items store other info into stats array.
710 */
711static struct digest_types : std::bitset<NUM_TYPES>
712{
713 digest_types ()
714 {
715 set (WEAPON);
716 set (BOW);
717 set (ARMOUR);
718 set (HELMET);
719 set (SHIELD);
720 set (RING);
721 set (BOOTS);
722 set (GLOVES);
723 set (AMULET);
724 set (GIRDLE);
725 set (BRACERS);
726 set (CLOAK);
727 set (DISEASE);
728 set (FORCE);
729 set (SKILL);
730 }
731} digest_types;
732 706
733static struct copy_flags : object::flags_t 707static struct copy_flags : object::flags_t
734{ 708{
735 copy_flags () 709 copy_flags ()
736 { 710 {
… …
763 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 737 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
764 object *grace_obj = NULL, *mana_obj = NULL, *tmp; 738 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
765 float old_speed = speed; 739 float old_speed = speed;
766 int stat_sum [NUM_STATS]; 740 int stat_sum [NUM_STATS];
767 741
742 MoveType move_type; // we use change_move_type to change it, so use a local copy
743
768 /* First task is to clear all the values back to their original values */ 744 /* First task is to clear all the values back to their original values */
769 if (type == PLAYER) 745 if (type == PLAYER)
770 { 746 {
747 contr->delayed_update = false;
748
771 for (int i = 0; i < NUM_STATS; i++) 749 for (int i = 0; i < NUM_STATS; i++)
772 stat_sum [i] = contr->orig_stats.stat (i); 750 stat_sum [i] = contr->orig_stats.stat (i);
773 751
774 if (settings.spell_encumbrance == TRUE) 752 if (settings.spell_encumbrance == TRUE)
775 contr->encumbrance = 0; 753 contr->encumbrance = 0;
… …
787 for (int i = NUM_BODY_LOCATIONS; i--; ) 765 for (int i = NUM_BODY_LOCATIONS; i--; )
788 slot[i].used = slot[i].info; 766 slot[i].used = slot[i].info;
789 767
790 slaying = 0; 768 slaying = 0;
791 769
792 if (!QUERY_FLAG (this, FLAG_WIZ)) 770 if (!this->flag [FLAG_WIZ])
793 {
794 CLEAR_FLAG (this, FLAG_XRAYS);
795 CLEAR_FLAG (this, FLAG_MAKE_INVIS);
796 } 771 {
772 this->clr_flag (FLAG_XRAYS);
773 this->clr_flag (FLAG_MAKE_INVIS);
774 }
797 775
798 CLEAR_FLAG (this, FLAG_LIFESAVE); 776 this->clr_flag (FLAG_LIFESAVE);
799 CLEAR_FLAG (this, FLAG_STEALTH); 777 this->clr_flag (FLAG_STEALTH);
800 CLEAR_FLAG (this, FLAG_BLIND); 778 this->clr_flag (FLAG_BLIND);
801 779
802 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 780 if (!arch->flag [FLAG_REFL_SPELL ]) this->clr_flag (FLAG_REFL_SPELL);
803 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 781 if (!arch->flag [FLAG_REFL_MISSILE]) this->clr_flag (FLAG_REFL_MISSILE);
804 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 782 if (!arch->flag [FLAG_UNDEAD ]) this->clr_flag (FLAG_UNDEAD);
805 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 783 if (!arch->flag [FLAG_SEE_IN_DARK ]) this->clr_flag (FLAG_SEE_IN_DARK);
806 784
807 path_attuned = arch->path_attuned; 785 path_attuned = arch->path_attuned;
808 path_repelled = arch->path_repelled; 786 path_repelled = arch->path_repelled;
809 path_denied = arch->path_denied; 787 path_denied = arch->path_denied;
810 glow_radius = arch->glow_radius; 788 glow_radius = arch->glow_radius;
811 move_type = arch->move_type; 789 move_type = arch->move_type;
812 790
813 chosen_skill = 0;
814
815 /* initializing resistances from the values in player/monster's 791 /* initializing resistances from the values in player/monster's
816 * archetype clone 792 * archetype clone
817 */ 793 */
818 memcpy (&resist, &arch->resist, sizeof (resist)); 794 memcpy (&resist, &arch->resist, sizeof (resist));
819 795
820 for (int i = 0; i < NROFATTACKS; i++) 796 for (int i = 0; i < NROFATTACKS; i++)
821 { 797 {
822 if (resist[i] > 0) 798 if (resist[i] > 0)
823 prot[i] = resist[i], vuln[i] = 0; 799 prot[i] = resist[i], vuln[i] = 0;
824 else 800 else
825 vuln[i] = -(resist[i]), prot[i] = 0; 801 vuln[i] = -resist[i], prot[i] = 0;
826 802
827 potion_resist[i] = 0; 803 potion_resist[i] = -1000;
828 } 804 }
829 805
830 wc = arch->stats.wc; 806 wc = arch->stats.wc;
831 stats.dam = arch->stats.dam; 807 stats.dam = arch->stats.dam;
832 808
… …
835 * the fact that maxlevel is factored in could be considered sort of bogus - 811 * the fact that maxlevel is factored in could be considered sort of bogus -
836 * we should probably give them some bonus and cap it off - otherwise, 812 * we should probably give them some bonus and cap it off - otherwise,
837 * basically, if a server updates its max level, these playes may find 813 * basically, if a server updates its max level, these playes may find
838 * that their protection from physical goes down 814 * that their protection from physical goes down
839 */ 815 */
840 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 816 if (!this->flag [FLAG_USE_ARMOUR] && type == PLAYER)
841 { 817 {
842 ac = max (-10, arch->stats.ac - level / 3); 818 ac = max (-10, arch->stats.ac - level / 3);
843 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 819 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
844 } 820 }
845 else 821 else
846 ac = arch->stats.ac; 822 ac = arch->stats.ac;
847 823
848 stats.luck = arch->stats.luck; 824 stats.luck = arch->stats.luck;
849 speed = arch->speed; 825 speed = arch->speed;
826
827 chosen_skill = 0;
850 828
851 /* OK - we've reset most all the objects attributes to sane values. 829 /* OK - we've reset most all the objects attributes to sane values.
852 * now go through and make adjustments for what the player has equipped. 830 * now go through and make adjustments for what the player has equipped.
853 */ 831 */
854 for (tmp = inv; tmp; tmp = tmp->below) 832 for (tmp = inv; tmp; tmp = tmp->below)
855 { 833 {
856 /* This happens because apply_potion calls change_abil with the potion 834 /* This happens because apply_potion calls change_abil with the potion
857 * applied so we can tell the player what changed. But change_abil 835 * applied so we can tell the player what changed. But change_abil
858 * then calls this function. 836 * then calls this function.
859 */ 837 */
860 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 838 if (tmp->flag [FLAG_APPLIED] && tmp->type == POTION)
861 continue; 839 continue;
862 840
863 /* See note in map.c:update_position about making this additive
864 * since light sources are never applied, need to put check here.
865 */
866 glow_radius = max (glow_radius, tmp->glow_radius); 841 glow_radius += tmp->glow_radius;
867 842
868 /* For some things, we don't care what is equipped */ 843 /* For some things, we don't care what is equipped */
869 if (tmp->type == SKILL) 844 if (tmp->type == SKILL)
870 { 845 {
871 /* Want to take the highest skill here. */ 846 /* Want to take the highest skill here. */
… …
896 * up, etc. 871 * up, etc.
897 */ 872 */
898 if ((tmp->flag [FLAG_APPLIED] 873 if ((tmp->flag [FLAG_APPLIED]
899 && tmp->type != CONTAINER 874 && tmp->type != CONTAINER
900 && tmp->type != CLOSE_CON) 875 && tmp->type != CLOSE_CON)
901 || (tmp->type == SKILL
902 && tmp->subtype == SK_PRAYING)) 876 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
903 { 877 {
904 if (type == PLAYER) 878 if (type == PLAYER)
905 { 879 {
906 contr->item_power += tmp->item_power; 880 contr->item_power += tmp->item_power;
907 881
908 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
909 if (tmp != current_weapon
910 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
911 && !tmp->flag [FLAG_CURSED]
912 && !tmp->flag [FLAG_DAMNED])
913 continue;
914
915 for (int i = 0; i < NUM_STATS; i++) 882 for (int i = 0; i < NUM_STATS; i++)
916 stat_sum [i] = stat_sum [i] + tmp->stats.stat (i); 883 stat_sum [i] += tmp->stats.stat (i);
917 884
918 if (digest_types [tmp->type]) 885 if (digest_types [tmp->type])
919 { 886 {
920 contr->digestion += tmp->stats.food; 887 contr->digestion += tmp->stats.food;
921 contr->gen_hp += tmp->stats.hp; 888 contr->gen_hp += tmp->stats.hp;
… …
930 if (tmp->type == WEAPON) 897 if (tmp->type == WEAPON)
931 current_weapon = tmp; 898 current_weapon = tmp;
932 } 899 }
933 900
934 /* Update slots used for items */ 901 /* Update slots used for items */
935 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 902 if (tmp->flag [FLAG_APPLIED]) // exclude praying...
936 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 903 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
937 slot[i].used += tmp->slot[i].info; 904 slot[i].used += tmp->slot[i].info;
938 905
939 if (tmp->type == SYMPTOM) 906 if (tmp->type == SYMPTOM)
940 speed_reduce_from_disease =
941 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); 907 min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
942 908
943 /* Pos. and neg. protections are counted separate (-> pro/vuln). 909 /* Pos. and neg. protections are counted separate (-> pro/vuln).
944 * (Negative protections are calculated exactly like positive.) 910 * (Negative protections are calculated exactly like positive.)
945 * Resistance from potions are treated special as well. If there's 911 * Resistance from potions are treated special as well. If there's
946 * more than one potion-effect, the bigger prot.-value is taken. 912 * more than one potion-effect, the bigger prot.-value is taken.
947 */ 913 */
948 if (tmp->type != POTION) 914 if (tmp->type == POTION_EFFECT)
949 {
950 for (int i = 0; i < NROFATTACKS; i++) 915 for (int i = 0; i < NROFATTACKS; i++)
951 {
952 /* Potential for cursed potions, in which case we just can use
953 * a straight MAX, as potion_resist is initialised to zero.
954 */
955 if (tmp->type == POTION_EFFECT)
956 {
957 if (potion_resist[i])
958 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
959 else
960 potion_resist[i] = tmp->resist[i]; 916 max_it (potion_resist[i], tmp->resist[i]);
961 } 917 else if (tmp->type != POTION)
918 for (int i = 0; i < NROFATTACKS; i++)
962 else if (tmp->resist[i] > 0) 919 if (tmp->resist[i] > 0)
963 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 920 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
964 else if (tmp->resist[i] < 0) 921 else if (tmp->resist[i] < 0)
965 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 922 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
966 }
967 }
968 923
969 /* There may be other things that should not adjust the attacktype */ 924 /* There may be other things that should not adjust the attacktype */
970 if (tmp->type != SYMPTOM) 925 if (tmp->type != SYMPTOM)
971 { 926 {
972 attacktype |= tmp->attacktype; 927 attacktype |= tmp->attacktype;
… …
977 stats.luck += tmp->stats.luck; 932 stats.luck += tmp->stats.luck;
978 } 933 }
979 934
980 flag |= tmp->flag & copy_flags; 935 flag |= tmp->flag & copy_flags;
981 936
982 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD)) 937 if (tmp->flag [FLAG_UNDEAD] && !arch->flag [FLAG_UNDEAD])
983 SET_FLAG (this, FLAG_UNDEAD); 938 this->set_flag (FLAG_UNDEAD);
984 939
985 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 940 //TODO: copy_flags?
941 if (tmp->flag [FLAG_MAKE_INVIS])
986 { 942 {
987 SET_FLAG (this, FLAG_MAKE_INVIS); 943 this->set_flag (FLAG_MAKE_INVIS);
988 invisible = 1; 944 invisible = 1;
989 } 945 }
990 946
991 if (tmp->stats.exp && tmp->type != SKILL) 947 if (tmp->stats.exp && tmp->type != SKILL)
992 { 948 {
… …
999 added_speed += tmp->stats.exp; 955 added_speed += tmp->stats.exp;
1000 } 956 }
1001 957
1002 switch (tmp->type) 958 switch (tmp->type)
1003 { 959 {
1004#if 0
1005 case WAND:
1006 case ROD:
1007 case HORN:
1008 if (type != PLAYER || current_weapon == tmp)
1009 chosen_skill = tmp;
1010 break;
1011#endif
1012
1013 /* skills modifying the character -b.t. */
1014 /* for all skills and skill granting objects */
1015 case SKILL: 960 case SKILL:
1016 { 961 {
962 // some skills will end up here without counting as "applied"
1017 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY) 963 if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK)
1018 break; 964 break;
1019 965
1020 if (chosen_skill) 966 if (chosen_skill)
1021 { 967 {
1022 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n", 968 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
… …
1024 970
1025 tmp->flag [FLAG_APPLIED] = false; 971 tmp->flag [FLAG_APPLIED] = false;
1026 update_stats (); 972 update_stats ();
1027 return; 973 return;
1028 } 974 }
1029 else 975
1030 chosen_skill = tmp; 976 chosen_skill = tmp;
1031 977
1032 if (tmp->stats.dam > 0) 978 if (tmp->stats.dam > 0)
1033 { /* skill is a 'weapon' */ 979 { /* skill is a 'weapon' */
1034 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 980 if (!this->flag [FLAG_READY_WEAPON])
1035 weapon_speed = WEAPON_SPEED (tmp); 981 weapon_speed = max (0, WEAPON_SPEED (tmp));
1036
1037 if (weapon_speed < 0)
1038 weapon_speed = 0;
1039 982
1040 weapon_weight = tmp->weight; 983 weapon_weight = tmp->weight;
1041 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9; 984 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1042 985
1043 if (tmp->magic) 986 if (tmp->magic)
… …
1052 995
1053 if (tmp->stats.ac) 996 if (tmp->stats.ac)
1054 ac -= tmp->stats.ac + tmp->magic; 997 ac -= tmp->stats.ac + tmp->magic;
1055 998
1056 if (settings.spell_encumbrance == TRUE && type == PLAYER) 999 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1057 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1000 contr->encumbrance += 3 * tmp->weight / 1000;
1058 } 1001 }
1059 1002
1060 break; 1003 break;
1061 1004
1062 case SHIELD: 1005 case SHIELD:
1063 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1006 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1064 contr->encumbrance += (int) tmp->weight / 2000; 1007 contr->encumbrance += tmp->weight / 2000;
1008 //FALLTHROUGH
1065 case RING: 1009 case RING:
1066 case AMULET: 1010 case AMULET:
1067 case GIRDLE: 1011 case GIRDLE:
1068 case HELMET: 1012 case HELMET:
1069 case BOOTS: 1013 case BOOTS:
… …
1078 if (tmp->stats.ac) 1022 if (tmp->stats.ac)
1079 ac -= tmp->stats.ac + tmp->magic; 1023 ac -= tmp->stats.ac + tmp->magic;
1080 1024
1081 break; 1025 break;
1082 1026
1027 case WAND:
1028 case ROD:
1029 case HORN:
1030 break;
1031
1083 case BOW: 1032 case BOW:
1084 case WEAPON: 1033 case WEAPON:
1085 if (type != PLAYER || current_weapon == tmp)
1086 {
1087 wc -= tmp->stats.wc + tmp->magic; 1034 wc -= tmp->stats.wc + tmp->magic;
1088 1035
1089 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1036 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1090 ac -= tmp->stats.ac + tmp->magic; 1037 ac -= tmp->stats.ac + tmp->magic;
1091 1038
1092 stats.dam += tmp->stats.dam + tmp->magic; 1039 stats.dam += tmp->stats.dam + tmp->magic;
1093 weapon_weight = tmp->weight; 1040 weapon_weight = tmp->weight;
1094 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1041 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1095 1042
1096 if (weapon_speed < 0) 1043 if (weapon_speed < 0)
1097 weapon_speed = 0; 1044 weapon_speed = 0;
1098 1045
1099 slaying = tmp->slaying; 1046 slaying = tmp->slaying;
1100 1047
1101 /* If there is desire that two handed weapons should do 1048 /* If there is desire that two handed weapons should do
1102 * extra strength damage, this is where the code should 1049 * extra strength damage, this is where the code should
1103 * go. 1050 * go.
1104 */ 1051 */
1105 1052
1106 if (type == PLAYER) 1053 if (type == PLAYER)
1107 if (settings.spell_encumbrance) 1054 if (settings.spell_encumbrance)
1108 contr->encumbrance += tmp->weight * 3 / 1000; 1055 contr->encumbrance += tmp->weight * 3 / 1000;
1109 }
1110 1056
1111 break; 1057 break;
1112 1058
1113 case ARMOUR: /* Only the best of these three are used: */ 1059 case ARMOUR: /* Only the best of these three are used: */
1114 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1060 if (settings.spell_encumbrance == TRUE && type == PLAYER)
… …
1137 else /* To nullify the below effect */ 1083 else /* To nullify the below effect */
1138 ac += tmp->stats.ac + tmp->magic; 1084 ac += tmp->stats.ac + tmp->magic;
1139 } 1085 }
1140 1086
1141 if (tmp->stats.wc) 1087 if (tmp->stats.wc)
1142 wc -= (tmp->stats.wc + tmp->magic); 1088 wc -= tmp->stats.wc + tmp->magic;
1143 1089
1144 if (tmp->stats.ac) 1090 if (tmp->stats.ac)
1145 ac -= (tmp->stats.ac + tmp->magic); 1091 ac -= tmp->stats.ac + tmp->magic;
1146 1092
1147 if (ARMOUR_SPEED (tmp)) 1093 if (ARMOUR_SPEED (tmp))
1148 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); 1094 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1149 1095
1150 break; 1096 break;
1151 } /* switch tmp->type */ 1097 } /* switch tmp->type */
1152 } /* item is equipped */ 1098 } /* item is equipped */
1153 } /* for loop of items */ 1099 } /* for loop of items */
1100
1101 min_it (glow_radius, MAX_LIGHT_RADIUS);
1154 1102
1155 /* We've gone through all the objects the player has equipped. For many things, we 1103 /* We've gone through all the objects the player has equipped. For many things, we
1156 * have generated intermediate values which we now need to assign. 1104 * have generated intermediate values which we now need to assign.
1157 */ 1105 */
1158 1106
… …
1164 */ 1112 */
1165 for (int i = 0; i < NROFATTACKS; i++) 1113 for (int i = 0; i < NROFATTACKS; i++)
1166 { 1114 {
1167 resist[i] = prot[i] - vuln[i]; 1115 resist[i] = prot[i] - vuln[i];
1168 1116
1169 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1117 if (potion_resist[i] != -1000
1118 && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1170 resist[i] = potion_resist[i]; 1119 resist[i] = potion_resist[i];
1171 } 1120 }
1172 1121
1173 if (type == PLAYER) 1122 if (type == PLAYER)
1174 { 1123 {
1175 // clamp various player stats 1124 // clamp various player stats
1176 for (int i = 0; i < NUM_STATS; ++i) 1125 for (int i = 0; i < NUM_STATS; ++i)
1177 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT); 1126 stats.stat (i) = stat_sum [i];
1127
1128 check_stat_bounds (&stats);
1178 1129
1179 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION); 1130 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1180 1131
1181 /* Figure out the players sp/mana/hp totals. */ 1132 /* Figure out the players sp/mana/hp totals. */
1182 int pl_level; 1133 int pl_level;
1183 1134
1184 check_stat_bounds (&(stats));
1185 pl_level = level;
1186
1187 if (pl_level < 1)
1188 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1135 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1189 1136
1190 /* You basically get half a con bonus/level. But we do take into account rounding, 1137 /* You basically get half a con bonus/level. But we do take into account rounding,
1191 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1138 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1192 */ 1139 */
1193 stats.maxhp = 0; 1140 stats.maxhp = 0;
… …
1328 1275
1329 speed = 1.f + speed_bonus[stats.Dex]; 1276 speed = 1.f + speed_bonus[stats.Dex];
1330 1277
1331 if (settings.search_items && contr->search_str[0]) 1278 if (settings.search_items && contr->search_str[0])
1332 speed -= 1; 1279 speed -= 1;
1333
1334 if (attacktype == 0)
1335 attacktype = arch->attacktype;
1336 } /* End if player */ 1280 } /* End if player */
1337 1281
1338 if (added_speed >= 0) 1282 if (added_speed >= 0)
1339 speed += added_speed / 10.f; 1283 speed += added_speed / 10.f;
1340 else /* Something wrong here...: */ 1284 else /* Something wrong here...: */
… …
1359 speed *= speed_reduce_from_disease; 1303 speed *= speed_reduce_from_disease;
1360 1304
1361 /* Put a lower limit on speed. Note with this speed, you move once every 1305 /* Put a lower limit on speed. Note with this speed, you move once every
1362 * 25 ticks or so. This amounts to once every 3 seconds of realtime. 1306 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1363 */ 1307 */
1364 if (speed < 0.04f && type == PLAYER) 1308 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1365 speed = 0.04f;
1366 1309
1367 if (speed != old_speed) 1310 if (speed != old_speed)
1368 set_speed (speed); 1311 set_speed (speed);
1369 1312
1370 if (type == PLAYER) 1313 if (type == PLAYER)
… …
1405 if (move_type == 0) 1348 if (move_type == 0)
1406 move_type = MOVE_WALK; 1349 move_type = MOVE_WALK;
1407 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1350 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1408 move_type &= ~MOVE_WALK; 1351 move_type &= ~MOVE_WALK;
1409 1352
1353 // now apply the new move_type
1354 if (this->move_type != move_type)
1355 change_move_type (move_type);
1356
1410 /* It is quite possible that a player's spell costing might have changed, 1357 /* It is quite possible that a player's spell costing might have changed,
1411 * so we will check that now. 1358 * so we will check that now.
1412 */ 1359 */
1413 if (type == PLAYER) 1360 if (is_player ())
1414 { 1361 contr->update_spells ();
1415 esrv_update_stats (contr);
1416 esrv_update_spells (contr);
1417 }
1418 1362
1419 // update the mapspace, if we are on a map 1363 // update the mapspace, if we are on a map
1420 if (!flag [FLAG_REMOVED] && map) 1364 if (!flag [FLAG_REMOVED] && map)
1421 map->at (x, y).flags_ = 0; 1365 map->at (x, y).flags_ = 0;
1366}
1367
1368void
1369object::set_glow_radius (sint8 rad)
1370{
1371 glow_radius = rad;
1372
1373 if (is_on_map ())
1374 update_all_los (map, x, y);
1375 else if (object *env = outer_env ())
1376 {
1377 env->update_stats ();
1378
1379 if (env->is_on_map ())
1380 update_all_los (env->map, env->x, env->y);
1381 }
1422} 1382}
1423 1383
1424/* 1384/*
1425 * Returns true if the given player is a legal class. 1385 * Returns true if the given player is a legal class.
1426 * The function to add and remove class-bonuses to the stats doesn't 1386 * The function to add and remove class-bonuses to the stats doesn't
… …
1442 1402
1443/* 1403/*
1444 * set the new dragon name after gaining levels or 1404 * set the new dragon name after gaining levels or
1445 * changing ability focus (later this can be extended to 1405 * changing ability focus (later this can be extended to
1446 * eventually change the player's face and animation) 1406 * eventually change the player's face and animation)
1447 *
1448 * Note that the title is written to 'own_title' in the
1449 * player struct. This should be changed to 'ext_title'
1450 * as soon as clients support this!
1451 * Please, anyone, write support for 'ext_title'.
1452 */ 1407 */
1453void 1408void
1454set_dragon_name (object *pl, const object *abil, const object *skin) 1409set_dragon_name (object *pl, const object *abil, const object *skin)
1455{ 1410{
1456 int atnr = -1; /* attacknumber of highest level */ 1411 int atnr = -1; /* attacknumber of highest level */
… …
1474 /* now if there are equals at highest level, pick the one with focus, 1429 /* now if there are equals at highest level, pick the one with focus,
1475 or else at random */ 1430 or else at random */
1476 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1431 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1477 atnr = abil->stats.exp; 1432 atnr = abil->stats.exp;
1478 1433
1479 level = (int) (level / 25.);
1480
1481 /* now set the new title */ 1434 /* now set the new title */
1482 if (pl->contr)
1483 {
1484 if (level == 0)
1485 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1435 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1486 else if (level == 1)
1487 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1436 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1488 else if (level == 2)
1489 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1437 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1490 else if (level == 3)
1491 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1438 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1492 else 1439 else
1493 { 1440 {
1494 /* special titles for extra high resistance! */ 1441 /* special titles for extra high resistance! */
1495 if (skin->resist[atnr] > 80)
1496 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1442 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1497 else if (skin->resist[atnr] > 50)
1498 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1443 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1499 else
1500 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1444 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1501 }
1502 } 1445 }
1503 1446
1504 strcpy (pl->contr->own_title, ""); 1447 strcpy (pl->contr->own_title, "");
1505} 1448}
1506 1449
1507/* 1450/*
1508 * This function is called when a dragon-player gains 1451 * This function is called when a dragon-player gains
1509 * an overall level. Here, the dragon might gain new abilities 1452 * an overall level. Here, the dragon might gain new abilities
1510 * or change the ability-focus. 1453 * or change the ability-focus.
1511 */ 1454 */
1512void 1455static void
1513dragon_level_gain (object *who) 1456dragon_level_gain (object *who)
1514{ 1457{
1515 object *abil = NULL; /* pointer to dragon ability force */ 1458 object *abil = NULL; /* pointer to dragon ability force */
1516 object *skin = NULL; /* pointer to dragon skin force */ 1459 object *skin = NULL; /* pointer to dragon skin force */
1517 object *tmp = NULL; /* tmp. object */ 1460 object *tmp = NULL; /* tmp. object */
… …
1573 object *skill_obj; 1516 object *skill_obj;
1574 1517
1575 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1518 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1576 if (!skill_obj) 1519 if (!skill_obj)
1577 { 1520 {
1578 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1521 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1579 return NULL; 1522 return NULL;
1580 } 1523 }
1581 1524
1582 /* clear the flag - exp goes into this bucket, but player 1525 /* clear the flag - exp goes into this bucket, but player
1583 * still doesn't know it. 1526 * still doesn't know it.
1584 */ 1527 */
1585 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1528 skill_obj->clr_flag (FLAG_CAN_USE_SKILL);
1586 skill_obj->stats.exp = 0; 1529 skill_obj->stats.exp = 0;
1587 skill_obj->level = 1; 1530 skill_obj->level = 1;
1588 insert_ob_in_ob (skill_obj, op); 1531 op->insert (skill_obj);
1589 1532
1590 if (player *pl = op->contr) 1533 if (player *pl = op->contr)
1591 { 1534 pl->link_skills ();
1592 pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1593 if (pl->ns)
1594 pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1595 }
1596 1535
1597 return skill_obj; 1536 return skill_obj;
1598} 1537}
1599 1538
1600/* player_lvl_adj() - for the new exp system. we are concerned with 1539/* player_lvl_adj() - for the new exp system. we are concerned with
… …
1617 { 1556 {
1618 changed = true; 1557 changed = true;
1619 1558
1620 op->level++; 1559 op->level++;
1621 1560
1622 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1561 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1623 dragon_level_gain (who); 1562 dragon_level_gain (who);
1624 1563
1625 /* Only roll these if it is the player (who) that gained the level */ 1564 /* Only roll these if it is the player (who) that gained the level */
1626 if (op == who && (who->level < 11) && who->type == PLAYER) 1565 if (op == who && (who->level < 11) && who->type == PLAYER)
1627 { 1566 {
… …
1660 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1599 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1661 } 1600 }
1662 } 1601 }
1663 1602
1664 if (changed) 1603 if (changed)
1665 { 1604 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1666 who->update_stats ();
1667 esrv_update_stats (who->contr);
1668 /* check if the spell data has changed */
1669 esrv_update_spells (who->contr);
1670 }
1671} 1605}
1672 1606
1673/* 1607/*
1674 * Returns how much experience is needed for a player to become 1608 * Returns how much experience is needed for a player to become
1675 * the given level. level should really never exceed max_level 1609 * the given level. level should really never exceed max_level
1676 */ 1610 */
1677 1611
1678sint64 1612sint64
1679level_exp (int level, double expmul) 1613level_exp (int level, double expmul)
1680{ 1614{
1681 if (level > settings.max_level) 1615 return expmul * level_to_min_exp (level);
1682 return (sint64) (expmul * levels[settings.max_level]);
1683
1684 return (sint64) (expmul * levels[level]);
1685} 1616}
1686 1617
1687/* 1618/*
1688 * Ensure that the permanent experience requirements in an exp object are met. 1619 * Ensure that the permanent experience requirements in an exp object are met.
1689 * This really just checks 'op to make sure the perm_exp value is within 1620 * This really just checks 'op to make sure the perm_exp value is within
… …
1719 * flag is what to do if the player doesn't have the skill: 1650 * flag is what to do if the player doesn't have the skill:
1720 */ 1651 */
1721static void 1652static void
1722add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1653add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1723{ 1654{
1724 object *skill_obj = NULL; 1655 object *skill_obj;
1725 sint64 limit, exp_to_add; 1656 sint64 limit, exp_to_add;
1726 int i; 1657 int i;
1727 1658
1728 /* prevents some forms of abuse. */ 1659 /* prevents some forms of abuse. */
1729 if (op->contr->braced) 1660 if (op->contr->braced)
… …
1732 /* Try to find the matching skill. 1663 /* Try to find the matching skill.
1733 * We do a shortcut/time saving mechanism first - see if it matches 1664 * We do a shortcut/time saving mechanism first - see if it matches
1734 * chosen_skill. This means we don't need to search through 1665 * chosen_skill. This means we don't need to search through
1735 * the players inventory. 1666 * the players inventory.
1736 */ 1667 */
1668 skill_obj = 0;
1669
1737 if (skill_name) 1670 if (skill_name)
1738 { 1671 {
1739 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1672 skill_obj = op->contr->find_skill (skill_name);
1740 skill_obj = op->chosen_skill;
1741 else
1742 {
1743 for (i = 0; i < NUM_SKILLS; i++)
1744 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1745 {
1746 skill_obj = op->contr->last_skill_ob[i];
1747 break;
1748 }
1749 1673
1750 /* Player doesn't have the skill. Check to see what to do, and give 1674 /* Player doesn't have the skill. Check to see what to do, and give
1751 * it to the player if necessary 1675 * it to the player if necessary
1752 */ 1676 */
1753 if (!skill_obj) 1677 if (!skill_obj)
1754 { 1678 {
1755 if (flag == SK_EXP_NONE) 1679 if (flag == SK_EXP_NONE)
1756 return; 1680 return;
1681
1757 else if (flag == SK_EXP_ADD_SKILL) 1682 if (flag == SK_EXP_ADD_SKILL)
1758 give_skill_by_name (op, skill_name); 1683 skill_obj = give_skill_by_name (op, skill_name);
1759 }
1760 } 1684 }
1761 } 1685 }
1762 1686
1763 if (flag != SK_EXP_SKILL_ONLY) 1687 if (flag != SK_EXP_SKILL_ONLY)
1764 { 1688 {
1765 /* Basically, you can never gain more experience in one shot 1689 /* Basically, you can never gain more experience in one shot
1766 * than half what you need to gain for next level. 1690 * than half what you need to gain for next level.
1767 */ 1691 */
1768 exp_to_add = exp; 1692 exp_to_add = exp;
1769 limit = (levels[op->level + 1] - levels[op->level]) / 2; 1693 limit = (levels [op->level + 1] - levels [op->level]) / 2;
1770 if (exp_to_add > limit) 1694 if (exp_to_add > limit)
1771 exp_to_add = limit; 1695 exp_to_add = limit;
1772 1696
1773 ADD_EXP (op->stats.exp, (sint64) ((float) exp_to_add * (skill_obj ? skill_obj->expmul : 1))); 1697 ADD_EXP (op->stats.exp, (sint64) ((float) exp_to_add * (skill_obj ? skill_obj->expmul : 1)));
1774 if (settings.permanent_exp_ratio) 1698 if (settings.permanent_exp_ratio)
… …
1781 } 1705 }
1782 1706
1783 if (skill_obj) 1707 if (skill_obj)
1784 { 1708 {
1785 exp_to_add = exp; 1709 exp_to_add = exp;
1786 limit = (levels[skill_obj->level + 1] - levels[skill_obj->level]) / 2; 1710 limit = (levels [skill_obj->level + 1] - levels [skill_obj->level]) / 2;
1787 if (exp_to_add > limit) 1711 if (exp_to_add > limit)
1788 exp_to_add = limit; 1712 exp_to_add = limit;
1789 1713
1790 ADD_EXP (skill_obj->stats.exp, exp_to_add); 1714 ADD_EXP (skill_obj->stats.exp, exp_to_add);
1791 if (settings.permanent_exp_ratio) 1715 if (settings.permanent_exp_ratio)
… …
1797 player_lvl_adj (op, skill_obj); 1721 player_lvl_adj (op, skill_obj);
1798 } 1722 }
1799} 1723}
1800 1724
1801/* This function checks to make sure that object 'op' can 1725/* This function checks to make sure that object 'op' can
1802 * lost 'exp' experience. It returns the amount of exp 1726 * lose 'exp' experience. It returns the amount of exp
1803 * object 'op' can in fact lose - it basically makes 1727 * object 'op' can in fact lose - it basically makes
1804 * adjustments based on permanent exp and the like. 1728 * adjustments based on permanent exp and the like.
1805 * This function should always be used for losing experience - 1729 * This function should always be used for losing experience -
1806 * the 'exp' value passed should be positive - this is the 1730 * the 'exp' value passed should be positive - this is the
1807 * amount that should get subtract from the player. 1731 * amount that should get subtract from the player.
1808 */ 1732 */
1809sint64 1733static sint64
1810check_exp_loss (const object *op, sint64 exp) 1734check_exp_loss (const object *op, sint64 exp)
1811{ 1735{
1812 sint64 del_exp; 1736 sint64 del_exp;
1813 1737
1814 if (exp > op->stats.exp) 1738 if (exp > op->stats.exp)
1815 exp = op->stats.exp; 1739 exp = op->stats.exp;
1740
1816 if (settings.permanent_exp_ratio) 1741 if (settings.permanent_exp_ratio)
1817 { 1742 {
1818 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1743 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1744
1819 if (del_exp < 0) 1745 if (del_exp < 0)
1820 del_exp = 0; 1746 del_exp = 0;
1747
1821 if (exp > del_exp) 1748 if (exp > del_exp)
1822 exp = del_exp; 1749 exp = del_exp;
1823 } 1750 }
1751
1824 return exp; 1752 return exp;
1825} 1753}
1826 1754
1827sint64 1755sint64
1828check_exp_adjust (const object *op, sint64 exp) 1756check_exp_adjust (const object *op, sint64 exp)
1829{ 1757{
1830 if (exp < 0) 1758 if (exp < 0)
1831 return check_exp_loss (op, exp); 1759 return check_exp_loss (op, exp);
1832 else 1760 else
1833 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1761 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1834} 1762}
1835
1836 1763
1837/* Subtracts experience from player. 1764/* Subtracts experience from player.
1838 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1765 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1839 * only subtract from the matching skill. Otherwise, 1766 * only subtract from the matching skill. Otherwise,
1840 * this subtracts a portion from all 1767 * this subtracts a portion from all
… …
1854 sint64 del_exp; 1781 sint64 del_exp;
1855 1782
1856 for (tmp = op->inv; tmp; tmp = tmp->below) 1783 for (tmp = op->inv; tmp; tmp = tmp->below)
1857 if (tmp->type == SKILL && tmp->stats.exp) 1784 if (tmp->type == SKILL && tmp->stats.exp)
1858 { 1785 {
1859 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1786 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1860 { 1787 {
1861 del_exp = check_exp_loss (tmp, exp); 1788 del_exp = check_exp_loss (tmp, exp);
1862 tmp->stats.exp -= del_exp; 1789 tmp->stats.exp -= del_exp;
1863 player_lvl_adj (op, tmp); 1790 player_lvl_adj (op, tmp);
1864 } 1791 }
… …
1916 * worth. 1843 * worth.
1917 */ 1844 */
1918 if (op->type != PLAYER) 1845 if (op->type != PLAYER)
1919 { 1846 {
1920 /* Sanity check */ 1847 /* Sanity check */
1921 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1848 if (!op->flag [FLAG_ALIVE])
1922 return; 1849 return;
1923 1850
1924 /* reset exp to max allowed value. We subtract from 1851 /* reset exp to max allowed value. We subtract from
1925 * MAX_EXPERIENCE to prevent overflows. If the player somehow has 1852 * MAX_EXPERIENCE to prevent overflows. If the player somehow has
1926 * more than max exp, just return. 1853 * more than max exp, just return.
… …
1952 * amount of permenent experience, whichever gives the lowest loss. 1879 * amount of permenent experience, whichever gives the lowest loss.
1953 */ 1880 */
1954void 1881void
1955apply_death_exp_penalty (object *op) 1882apply_death_exp_penalty (object *op)
1956{ 1883{
1957 object *tmp;
1958 sint64 loss; 1884 sint64 loss;
1959 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1885 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1960 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1886 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1961 1887
1962 for (tmp = op->inv; tmp; tmp = tmp->below) 1888 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1963 if (tmp->type == SKILL && tmp->stats.exp) 1889 if (tmp->type == SKILL && tmp->stats.exp)
1964 { 1890 {
1965
1966 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1891 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1967 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1892 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1968 1893
1969 /* With the revised exp system, you can get cases where 1894 /* With the revised exp system, you can get cases where
1970 * losing several levels would still require that you have more 1895 * losing several levels would still require that you have more
1971 * exp than you currently have - this is true if the levels 1896 * exp than you currently have - this is true if the levels
1972 * tables is a lot harder. 1897 * tables is a lot harder.
1973 */ 1898 */
1974 if (level_loss < 0) 1899 if (level_loss < 0)
1975 level_loss = 0; 1900 level_loss = 0;
1976 1901
1977 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1902 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1978 1903
1979 tmp->stats.exp -= loss; 1904 tmp->stats.exp -= loss;
1980 player_lvl_adj (op, tmp); 1905 player_lvl_adj (op, tmp);
1981 } 1906 }
1982 1907
1983 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1908 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1984 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1909 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1985 1910
1986 if (level_loss < 0) 1911 if (level_loss < 0)
1987 level_loss = 0; 1912 level_loss = 0;
1913
1988 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1914 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1989 1915
1990 op->stats.exp -= loss; 1916 op->stats.exp -= loss;
1991 player_lvl_adj (op, NULL); 1917 player_lvl_adj (op, NULL);
1992} 1918}
1993 1919

Diff Legend

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