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.59 by root, Thu May 17 00:33:29 2007 UTC vs.
Revision 1.75 by root, Tue Aug 7 22:36:18 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27 26
… …
311 * that adjust that stat by more than one point, so we need 310 * that adjust that stat by more than one point, so we need
312 * to allow for that. 311 * to allow for that.
313 */ 312 */
314 if (nstat < 1 && i * flag < 0) 313 if (nstat < 1 && i * flag < 0)
315 nstat = 1; 314 nstat = 1;
316 else if (nstat > 20 + op->arch->clone.stats.stat (j)) 315 else if (nstat > 20 + op->arch->stats.stat (j))
317 nstat = 20 + op->arch->clone.stats.stat (j); 316 nstat = 20 + op->arch->stats.stat (j);
318 317
319 if (nstat != ostat) 318 if (nstat != ostat)
320 { 319 {
321 op->contr->orig_stats.stat (j) = nstat; 320 op->contr->orig_stats.stat (j) = nstat;
322 potion_max = 0; 321 potion_max = 0;
… …
422 } 421 }
423 422
424 /* becoming UNDEAD... a special treatment for this flag. Only those not 423 /* becoming UNDEAD... a special treatment for this flag. Only those not
425 * originally undead may change their status 424 * originally undead may change their status
426 */ 425 */
427 if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 426 if (!QUERY_FLAG (op->arch, FLAG_UNDEAD))
428 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 427 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))
429 { 428 {
430 success = 1; 429 success = 1;
431 if (flag > 0) 430 if (flag > 0)
432 { 431 {
433 op->race = "undead"; 432 op->race = "undead";
434 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!"); 433 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
435 } 434 }
436 else 435 else
437 { 436 {
438 op->race = op->arch->clone.race; 437 op->race = op->arch->race;
439 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 438 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
440 } 439 }
441 } 440 }
442 441
443 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 442 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))
… …
685void 684void
686object::remove_statbonus () 685object::remove_statbonus ()
687{ 686{
688 for (int i = 0; i < NUM_STATS; ++i) 687 for (int i = 0; i < NUM_STATS; ++i)
689 { 688 {
690 sint8 v = arch->clone.stats.stat (i); 689 sint8 v = arch->stats.stat (i);
691 stats.stat (i) -= v; 690 stats.stat (i) -= v;
692 contr->orig_stats.stat (i) -= v; 691 contr->orig_stats.stat (i) -= v;
693 } 692 }
694} 693}
695 694
… …
699void 698void
700object::add_statbonus () 699object::add_statbonus ()
701{ 700{
702 for (int i = 0; i < NUM_STATS; ++i) 701 for (int i = 0; i < NUM_STATS; ++i)
703 { 702 {
704 sint8 v = arch->clone.stats.stat (i); 703 sint8 v = arch->stats.stat (i);
705 stats.stat (i) += v; 704 stats.stat (i) += v;
706 contr->orig_stats.stat (i) += v; 705 contr->orig_stats.stat (i) += v;
707 } 706 }
708} 707}
708
709/* These are the items that currently can change digestion, regeneration,
710 * spell point recovery and mana point recovery. Seems sort of an arbitary
711 * list, but other items store other info into stats array.
712 */
713static struct digest_types : std::bitset<NUM_TYPES>
714{
715 digest_types ()
716 {
717 set (WEAPON);
718 set (BOW);
719 set (ARMOUR);
720 set (HELMET);
721 set (SHIELD);
722 set (RING);
723 set (BOOTS);
724 set (GLOVES);
725 set (AMULET);
726 set (GIRDLE);
727 set (BRACERS);
728 set (CLOAK);
729 set (DISEASE);
730 set (FORCE);
731 set (SKILL);
732 }
733} digest_types;
734
735static struct copy_flags : object::flags_t
736{
737 copy_flags ()
738 {
739 set (FLAG_LIFESAVE);
740 set (FLAG_REFL_SPELL);
741 set (FLAG_REFL_MISSILE);
742 set (FLAG_STEALTH);
743 set (FLAG_XRAYS);
744 set (FLAG_BLIND);
745 set (FLAG_SEE_IN_DARK);
746 }
747} copy_flags;
709 748
710/* 749/*
711 * Updates all abilities given by applied objects in the inventory 750 * Updates all abilities given by applied objects in the inventory
712 * of the given object. Note: This function works for both monsters 751 * of the given object. Note: This function works for both monsters
713 * and players; the "player" in the name is purely an archaic inheritance. 752 * and players; the "player" in the name is purely an archaic inheritance.
… …
718 * spell system split, grace points now added to system --peterm 757 * spell system split, grace points now added to system --peterm
719 */ 758 */
720void 759void
721object::update_stats () 760object::update_stats ()
722{ 761{
723 int i, j;
724 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; 762 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
725 int weapon_weight = 0, weapon_speed = 0; 763 int weapon_weight = 0, weapon_speed = 0;
726 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 764 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
727 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 765 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
728 object *grace_obj = NULL, *mana_obj = NULL, *tmp; 766 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
729 float old_speed = speed; 767 float old_speed = speed;
768 int stat_sum [NUM_STATS];
730 769
731 /* First task is to clear all the values back to their original values */ 770 /* First task is to clear all the values back to their original values */
732 if (type == PLAYER) 771 if (type == PLAYER)
733 { 772 {
734 for (i = 0; i < NUM_STATS; i++) 773 for (int i = 0; i < NUM_STATS; i++)
735 stats.stat (i) = contr->orig_stats.stat (i); 774 stat_sum [i] = contr->orig_stats.stat (i);
736 775
737 if (settings.spell_encumbrance == TRUE) 776 if (settings.spell_encumbrance == TRUE)
738 contr->encumbrance = 0; 777 contr->encumbrance = 0;
739 778
740 attacktype = 0; 779 attacktype = 0;
… …
760 799
761 CLEAR_FLAG (this, FLAG_LIFESAVE); 800 CLEAR_FLAG (this, FLAG_LIFESAVE);
762 CLEAR_FLAG (this, FLAG_STEALTH); 801 CLEAR_FLAG (this, FLAG_STEALTH);
763 CLEAR_FLAG (this, FLAG_BLIND); 802 CLEAR_FLAG (this, FLAG_BLIND);
764 803
765 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 804 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
766 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 805 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
767 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 806 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
768 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 807 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
769 808
770 path_attuned = arch->clone.path_attuned; 809 path_attuned = arch->path_attuned;
771 path_repelled = arch->clone.path_repelled; 810 path_repelled = arch->path_repelled;
772 path_denied = arch->clone.path_denied; 811 path_denied = arch->path_denied;
773 glow_radius = arch->clone.glow_radius; 812 glow_radius = arch->glow_radius;
774 move_type = arch->clone.move_type; 813 move_type = arch->move_type;
775 814
776 chosen_skill = 0; 815 chosen_skill = 0;
777 816
778 /* initializing resistances from the values in player/monster's 817 /* initializing resistances from the values in player/monster's
779 * archetype clone 818 * archetype clone
780 */ 819 */
781 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 820 memcpy (&resist, &arch->resist, sizeof (resist));
782 821
783 for (i = 0; i < NROFATTACKS; i++) 822 for (int i = 0; i < NROFATTACKS; i++)
784 { 823 {
785 if (resist[i] > 0) 824 if (resist[i] > 0)
786 prot[i] = resist[i], vuln[i] = 0; 825 prot[i] = resist[i], vuln[i] = 0;
787 else 826 else
788 vuln[i] = -(resist[i]), prot[i] = 0; 827 vuln[i] = -(resist[i]), prot[i] = 0;
789 828
790 potion_resist[i] = 0; 829 potion_resist[i] = 0;
791 } 830 }
792 831
793 wc = arch->clone.stats.wc; 832 wc = arch->stats.wc;
794 stats.dam = arch->clone.stats.dam; 833 stats.dam = arch->stats.dam;
795 834
796 /* for players which cannot use armour, they gain AC -1 per 3 levels, 835 /* for players which cannot use armour, they gain AC -1 per 3 levels,
797 * plus a small amount of physical resist, those poor suckers. ;) 836 * plus a small amount of physical resist, those poor suckers. ;)
798 * the fact that maxlevel is factored in could be considered sort of bogus - 837 * the fact that maxlevel is factored in could be considered sort of bogus -
799 * we should probably give them some bonus and cap it off - otherwise, 838 * we should probably give them some bonus and cap it off - otherwise,
800 * basically, if a server updates its max level, these playes may find 839 * basically, if a server updates its max level, these playes may find
801 * that their protection from physical goes down 840 * that their protection from physical goes down
802 */ 841 */
803 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 842 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
804 { 843 {
805 ac = MAX (-10, arch->clone.stats.ac - level / 3); 844 ac = max (-10, arch->stats.ac - level / 3);
806 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 845 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
807 } 846 }
808 else 847 else
809 ac = arch->clone.stats.ac; 848 ac = arch->stats.ac;
810 849
811 stats.luck = arch->clone.stats.luck; 850 stats.luck = arch->stats.luck;
812 speed = arch->clone.speed; 851 speed = arch->speed;
813 852
814 /* OK - we've reset most all the objects attributes to sane values. 853 /* OK - we've reset most all the objects attributes to sane values.
815 * now go through and make adjustments for what the player has equipped. 854 * now go through and make adjustments for what the player has equipped.
816 */ 855 */
817 for (tmp = inv; tmp; tmp = tmp->below) 856 for (tmp = inv; tmp; tmp = tmp->below)
818 { 857 {
819 /* See note in map.c:update_position about making this additive
820 * since light sources are never applied, need to put check here.
821 */
822 if (tmp->glow_radius > glow_radius)
823 glow_radius = tmp->glow_radius;
824
825 /* This happens because apply_potion calls change_abil with the potion 858 /* This happens because apply_potion calls change_abil with the potion
826 * applied so we can tell the player what changed. But change_abil 859 * applied so we can tell the player what changed. But change_abil
827 * then calls this function. 860 * then calls this function.
828 */ 861 */
829 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
830 continue; 863 continue;
864
865 /* See note in map.c:update_position about making this additive
866 * since light sources are never applied, need to put check here.
867 */
868 if (tmp->glow_radius > glow_radius)
869 glow_radius = tmp->glow_radius;
831 870
832 /* For some things, we don't care what is equipped */ 871 /* For some things, we don't care what is equipped */
833 if (tmp->type == SKILL) 872 if (tmp->type == SKILL)
834 { 873 {
835 /* Want to take the highest skill here. */ 874 /* Want to take the highest skill here. */
… …
865 || (tmp->type == SKILL 904 || (tmp->type == SKILL
866 && tmp->subtype == SK_PRAYING)) 905 && tmp->subtype == SK_PRAYING))
867 { 906 {
868 if (type == PLAYER) 907 if (type == PLAYER)
869 { 908 {
909 contr->item_power += tmp->item_power;
910
870 if (tmp == contr->combat_ob || tmp == contr->ranged_ob) 911 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
871 if (tmp != current_weapon 912 if (tmp != current_weapon
872 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) 913 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
873 && !tmp->flag [FLAG_CURSED] 914 && !tmp->flag [FLAG_CURSED]
874 && !tmp->flag [FLAG_DAMNED]) 915 && !tmp->flag [FLAG_DAMNED])
875 continue; 916 continue;
876 917
877 for (i = 0; i < NUM_STATS; i++) 918 for (int i = 0; i < NUM_STATS; i++)
878 change_attr_value (&stats, i, tmp->stats.stat (i)); 919 if (expect_false (tmp->stats.stat (i)))
920 stat_sum [i] = clamp (stat_sum [i] + tmp->stats.stat (i), MIN_STAT, MAX_STAT);
879 921
880 /* These are the items that currently can change digestion, regeneration, 922 if (digest_types [tmp->type])
881 * spell point recovery and mana point recovery. Seems sort of an arbitary
882 * list, but other items store other info into stats array.
883 */
884 if (tmp->type == WEAPON || tmp->type == BOW ||
885 tmp->type == ARMOUR || tmp->type == HELMET ||
886 tmp->type == SHIELD || tmp->type == RING ||
887 tmp->type == BOOTS || tmp->type == GLOVES ||
888 tmp->type == AMULET || tmp->type == GIRDLE ||
889 tmp->type == BRACERS || tmp->type == CLOAK ||
890 tmp->type == DISEASE || tmp->type == FORCE ||
891 tmp->type == SKILL)
892 { 923 {
893 contr->digestion += tmp->stats.food; 924 contr->digestion += tmp->stats.food;
894 contr->gen_hp += tmp->stats.hp; 925 contr->gen_hp += tmp->stats.hp;
895 contr->gen_sp += tmp->stats.sp; 926 contr->gen_sp += tmp->stats.sp;
896 contr->gen_grace += tmp->stats.grace; 927 contr->gen_grace += tmp->stats.grace;
897 contr->gen_sp_armour += tmp->gen_sp_armour; 928 contr->gen_sp_armour += tmp->gen_sp_armour;
898 contr->item_power += tmp->item_power;
899 } 929 }
900 } /* if this is a player */ 930 } /* if this is a player */
901 else 931 else
902 { 932 {
903 if (tmp->type == WEAPON) 933 if (tmp->type == WEAPON)
904 current_weapon = tmp; 934 current_weapon = tmp;
905 } 935 }
906 936
907 /* Update slots used for items */ 937 /* Update slots used for items */
908 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 938 if (QUERY_FLAG (tmp, FLAG_APPLIED))
909 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 939 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
910 slot[i].used += tmp->slot[i].info; 940 slot[i].used += tmp->slot[i].info;
911 941
912 if (tmp->type == SYMPTOM) 942 if (tmp->type == SYMPTOM)
913 { 943 {
914 speed_reduce_from_disease = tmp->last_sp / 100.f; 944 speed_reduce_from_disease = tmp->last_sp / 100.f;
… …
922 * Resistance from potions are treated special as well. If there's 952 * Resistance from potions are treated special as well. If there's
923 * more than one potion-effect, the bigger prot.-value is taken. 953 * more than one potion-effect, the bigger prot.-value is taken.
924 */ 954 */
925 if (tmp->type != POTION) 955 if (tmp->type != POTION)
926 { 956 {
927 for (i = 0; i < NROFATTACKS; i++) 957 for (int i = 0; i < NROFATTACKS; i++)
928 { 958 {
929 /* Potential for cursed potions, in which case we just can use 959 /* Potential for cursed potions, in which case we just can use
930 * a straight MAX, as potion_resist is initialised to zero. 960 * a straight MAX, as potion_resist is initialised to zero.
931 */ 961 */
932 if (tmp->type == POTION_EFFECT) 962 if (tmp->type == POTION_EFFECT)
933 { 963 {
934 if (potion_resist[i]) 964 if (potion_resist[i])
935 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); 965 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
936 else 966 else
937 potion_resist[i] = tmp->resist[i]; 967 potion_resist[i] = tmp->resist[i];
938 } 968 }
939 else if (tmp->resist[i] > 0) 969 else if (tmp->resist[i] > 0)
940 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 970 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
… …
952 path_denied |= tmp->path_denied; 982 path_denied |= tmp->path_denied;
953 move_type |= tmp->move_type; 983 move_type |= tmp->move_type;
954 stats.luck += tmp->stats.luck; 984 stats.luck += tmp->stats.luck;
955 } 985 }
956 986
957 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 987 flag |= tmp->flag & copy_flags;
958 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
959 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
960 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
961 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
962 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
963 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
964 988
965 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) 989 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
966 SET_FLAG (this, FLAG_UNDEAD); 990 SET_FLAG (this, FLAG_UNDEAD);
967 991
968 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 992 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
969 { 993 {
970 SET_FLAG (this, FLAG_MAKE_INVIS); 994 SET_FLAG (this, FLAG_MAKE_INVIS);
… …
994#endif 1018#endif
995 1019
996 /* skills modifying the character -b.t. */ 1020 /* skills modifying the character -b.t. */
997 /* for all skills and skill granting objects */ 1021 /* for all skills and skill granting objects */
998 case SKILL: 1022 case SKILL:
999 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1023 {
1024 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
1000 break; 1025 break;
1001 1026
1002 if (chosen_skill) 1027 if (chosen_skill)
1028 {
1003 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1029 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
1030 &name, &chosen_skill->name, &tmp->name);
1004 1031
1032 tmp->flag [FLAG_APPLIED] = false;
1033 update_stats ();
1034 return;
1035 }
1036 else
1005 chosen_skill = tmp; 1037 chosen_skill = tmp;
1006 1038
1007 if (tmp->stats.dam > 0) 1039 if (tmp->stats.dam > 0)
1008 { /* skill is a 'weapon' */ 1040 { /* skill is a 'weapon' */
1009 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1041 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1010 weapon_speed = WEAPON_SPEED (tmp); 1042 weapon_speed = WEAPON_SPEED (tmp);
1011 1043
1012 if (weapon_speed < 0) 1044 if (weapon_speed < 0)
1013 weapon_speed = 0; 1045 weapon_speed = 0;
1014 1046
1015 weapon_weight = tmp->weight; 1047 weapon_weight = tmp->weight;
1016 stats.dam += 1 + (chosen_skill->level * tmp->stats.dam / 9); 1048 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1017 1049
1018 if (tmp->magic) 1050 if (tmp->magic)
1019 stats.dam += tmp->magic; 1051 stats.dam += tmp->magic;
1020 } 1052 }
1021 1053
1022 if (tmp->stats.wc) 1054 if (tmp->stats.wc)
1023 wc -= tmp->stats.wc + tmp->magic; 1055 wc -= tmp->stats.wc + tmp->magic;
1024 1056
1025 if (tmp->slaying) 1057 if (tmp->slaying)
1026 slaying = tmp->slaying; 1058 slaying = tmp->slaying;
1027 1059
1028 if (tmp->stats.ac) 1060 if (tmp->stats.ac)
1029 ac -= tmp->stats.ac + tmp->magic; 1061 ac -= tmp->stats.ac + tmp->magic;
1030 1062
1031 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1063 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1032 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1064 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1065 }
1033 1066
1034 break; 1067 break;
1035 1068
1036 case SHIELD: 1069 case SHIELD:
1037 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1070 if (settings.spell_encumbrance == TRUE && type == PLAYER)
… …
1116 wc -= (tmp->stats.wc + tmp->magic); 1149 wc -= (tmp->stats.wc + tmp->magic);
1117 1150
1118 if (tmp->stats.ac) 1151 if (tmp->stats.ac)
1119 ac -= (tmp->stats.ac + tmp->magic); 1152 ac -= (tmp->stats.ac + tmp->magic);
1120 1153
1121 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max) 1154 if (ARMOUR_SPEED (tmp))
1122 max = ARMOUR_SPEED (tmp) / 10.f; 1155 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1123 1156
1124 break; 1157 break;
1125 } /* switch tmp->type */ 1158 } /* switch tmp->type */
1126 } /* item is equipped */ 1159 } /* item is equipped */
1127 } /* for loop of items */ 1160 } /* for loop of items */
… …
1134 * If there is an uncursed potion in effect, granting more protection 1167 * If there is an uncursed potion in effect, granting more protection
1135 * than that, we take: 'total resistance = resistance from potion'. 1168 * than that, we take: 'total resistance = resistance from potion'.
1136 * If there is a cursed (and no uncursed) potion in effect, we take 1169 * If there is a cursed (and no uncursed) potion in effect, we take
1137 * 'total resistance = vulnerability from cursed potion'. 1170 * 'total resistance = vulnerability from cursed potion'.
1138 */ 1171 */
1139 for (i = 0; i < NROFATTACKS; i++) 1172 for (int i = 0; i < NROFATTACKS; i++)
1140 { 1173 {
1141 resist[i] = prot[i] - vuln[i]; 1174 resist[i] = prot[i] - vuln[i];
1142 1175
1143 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1176 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0)))
1144 resist[i] = potion_resist[i]; 1177 resist[i] = potion_resist[i];
1145 } 1178 }
1146 1179
1147 /* Figure out the players sp/mana/hp totals. */
1148 if (type == PLAYER) 1180 if (type == PLAYER)
1149 { 1181 {
1182 // clamp various player stats
1183 for (int i = 0; i < NUM_STATS; ++i)
1184 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT);
1185
1186 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1187
1188 /* Figure out the players sp/mana/hp totals. */
1150 int pl_level; 1189 int pl_level;
1151 1190
1152 check_stat_bounds (&(stats)); 1191 check_stat_bounds (&(stats));
1153 pl_level = level; 1192 pl_level = level;
1154 1193
… …
1156 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1195 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */
1157 1196
1158 /* You basically get half a con bonus/level. But we do take into account rounding, 1197 /* You basically get half a con bonus/level. But we do take into account rounding,
1159 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1198 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1160 */ 1199 */
1161 for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) 1200 stats.maxhp = 0;
1201 for (int i = 1; i <= min (10, pl_level); i++)
1162 { 1202 {
1163 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1203 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1164 1204
1165 if (i % 2 && con_bonus[stats.Con] % 2) 1205 if (i % 2 && con_bonus[stats.Con] % 2)
1166 {
1167 if (con_bonus[stats.Con] > 0) 1206 if (con_bonus[stats.Con] > 0)
1168 j++; 1207 j++;
1169 else 1208 else
1170 j--; 1209 j--;
1171 }
1172 1210
1173 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ 1211 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1174 } 1212 }
1175 1213
1176 for (i = 11; i <= level; i++) 1214 stats.maxhp += 2 * max (0, level - 10);
1177 stats.maxhp += 2;
1178 1215
1179 if (stats.hp > stats.maxhp) 1216 if (stats.hp > stats.maxhp)
1180 stats.hp = stats.maxhp; 1217 stats.hp = stats.maxhp;
1181 1218
1182 /* Sp gain is controlled by the level of the player's 1219 /* Sp gain is controlled by the level of the player's
… …
1195 1232
1196 if (mana_obj == this && type == PLAYER) 1233 if (mana_obj == this && type == PLAYER)
1197 stats.maxsp = 1; 1234 stats.maxsp = 1;
1198 else 1235 else
1199 { 1236 {
1200 sp_tmp = 0.f; 1237 float sp_tmp = 0.f;
1201 1238
1202 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1239 for (int i = 1; i <= min (10, mana_obj->level); i++)
1203 { 1240 {
1204 float stmp; 1241 float stmp;
1205 1242
1206 /* Got some extra bonus at first level */ 1243 /* Got some extra bonus at first level */
1207 if (i < 2) 1244 if (i < 2)
1208 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f; 1245 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1209 else 1246 else
1210 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; 1247 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1211 1248
1212 if (stmp < 1.f)
1213 stmp = 1.f;
1214
1215 sp_tmp += stmp; 1249 sp_tmp += max (1.f, stmp);
1216 } 1250 }
1217 1251
1218 stats.maxsp = (sint16)sp_tmp; 1252 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1219
1220 for (i = 11; i <= mana_obj->level; i++)
1221 stats.maxsp += 2;
1222 } 1253 }
1223 1254
1224 /* Characters can get their sp supercharged via rune of transferrance */ 1255 /* Characters can get their sp supercharged via rune of transferrance */
1225 if (stats.sp > stats.maxsp * 2) 1256 stats.sp = min (stats.sp, stats.maxsp * 2);
1226 stats.sp = stats.maxsp * 2;
1227 1257
1228 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ 1258 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1229 if (!grace_obj || !grace_obj->level || type != PLAYER) 1259 if (!grace_obj || !grace_obj->level || type != PLAYER)
1230 grace_obj = this; 1260 grace_obj = this;
1231 1261
… …
1236 /* store grace in a float - this way, the divisions below don't create 1266 /* store grace in a float - this way, the divisions below don't create
1237 * big jumps when you go from level to level - with int's, it then 1267 * big jumps when you go from level to level - with int's, it then
1238 * becomes big jumps when the sums of the bonuses jump to the next 1268 * becomes big jumps when the sums of the bonuses jump to the next
1239 * step of 8 - with floats, even fractional ones are useful. 1269 * step of 8 - with floats, even fractional ones are useful.
1240 */ 1270 */
1241 sp_tmp = 0.f; 1271 float sp_tmp = 0.f;
1242 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1272
1273 for (int i = 1; i <= min (10, grace_obj->level); i++)
1243 { 1274 {
1244 float grace_tmp = 0.f; 1275 float grace_tmp = 0.f;
1245 1276
1246 /* Got some extra bonus at first level */ 1277 /* Got some extra bonus at first level */
1247 if (i < 2) 1278 if (i < 2)
1248 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f; 1279 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1249 else 1280 else
1250 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; 1281 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1251 1282
1252 if (grace_tmp < 1.f)
1253 grace_tmp = 1.f;
1254
1255 sp_tmp += grace_tmp; 1283 sp_tmp += max (1.f, grace_tmp);
1256 } 1284 }
1257 1285
1258 stats.maxgrace = (sint16)sp_tmp;
1259
1260 /* two grace points per level after 11 */ 1286 /* two grace points per level after 10 */
1261 for (i = 11; i <= grace_obj->level; i++) 1287 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1262 stats.maxgrace += 2;
1263 } 1288 }
1264 1289
1265 /* No limit on grace vs maxgrace */ 1290 /* No limit on grace vs maxgrace */
1266 1291
1267 if (contr->braced) 1292 if (contr->braced)
… …
1287 1312
1288 if (contr && wc_obj && wc_obj->level > 1) 1313 if (contr && wc_obj && wc_obj->level > 1)
1289 { 1314 {
1290 wc -= wc_obj->level + thaco_bonus[stats.Str]; 1315 wc -= wc_obj->level + thaco_bonus[stats.Str];
1291 1316
1292 for (i = 1; i < wc_obj->level; i++) 1317 for (int i = 1; i < wc_obj->level; i++)
1293 { 1318 {
1294 /* additional wc every 6 levels */ 1319 /* additional wc every 6 levels */
1295 if (!(i % 6)) 1320 if (!(i % 6))
1296 wc--; 1321 wc--;
1297 1322
… …
1312 1337
1313 if (settings.search_items && contr->search_str[0]) 1338 if (settings.search_items && contr->search_str[0])
1314 speed -= 1; 1339 speed -= 1;
1315 1340
1316 if (attacktype == 0) 1341 if (attacktype == 0)
1317 attacktype = arch->clone.attacktype; 1342 attacktype = arch->attacktype;
1318 } /* End if player */ 1343 } /* End if player */
1319 1344
1320 if (added_speed >= 0) 1345 if (added_speed >= 0)
1321 speed += added_speed / 10.f; 1346 speed += added_speed / 10.f;
1322 else /* Something wrong here...: */ 1347 else /* Something wrong here...: */
1323 speed /= 1.f - added_speed; 1348 speed /= 1.f - added_speed;
1324 1349
1325 /* Max is determined by armour */ 1350 /* Max is determined by armour */
1326 if (speed > max) 1351 speed = min (speed, max_speed);
1327 speed = max;
1328 1352
1329 if (type == PLAYER) 1353 if (type == PLAYER)
1330 { 1354 {
1331 /* f is a number the represents the number of kg above (positive num) 1355 /* f is a number the represents the number of kg above (positive num)
1332 * or below (negative number) that the player is carrying. If above 1356 * or below (negative number) that the player is carrying. If above
… …
1365 K *= (4 + level) * 1.2f / (6 + level); 1389 K *= (4 + level) * 1.2f / (6 + level);
1366 1390
1367 if (K <= 0.01f) 1391 if (K <= 0.01f)
1368 K = 0.01f; 1392 K = 0.01f;
1369 1393
1370 float S = speed / (K * s); 1394 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1371
1372 contr->weapon_sp = S;
1373 } 1395 }
1374 1396
1375 /* I want to limit the power of small monsters with big weapons: */ 1397 /* I want to limit the power of small monsters with big weapons: */
1376 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) 1398 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1377 stats.dam = arch->clone.stats.dam * 3; 1399 stats.dam = arch->stats.dam * 3;
1378 1400
1379 stats.wc = clamp (wc, MIN_WC, MAX_WC); 1401 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1380 stats.ac = clamp (ac, MIN_AC, MAX_AC); 1402 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1381 1403
1382 /* if for some reason the creature doesn't have any move type, 1404 /* if for some reason the creature doesn't have any move type,
… …
1502 object *skin = NULL; /* pointer to dragon skin force */ 1524 object *skin = NULL; /* pointer to dragon skin force */
1503 object *tmp = NULL; /* tmp. object */ 1525 object *tmp = NULL; /* tmp. object */
1504 char buf[MAX_BUF]; /* tmp. string buffer */ 1526 char buf[MAX_BUF]; /* tmp. string buffer */
1505 1527
1506 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1528 /* now grab the 'dragon_ability'-forces from the player's inventory */
1507 shstr_cmp dragon_ability_force ("dragon_ability_force");
1508 shstr_cmp dragon_skin_force ("dragon_skin_force");
1509
1510 for (tmp = who->inv; tmp; tmp = tmp->below) 1529 for (tmp = who->inv; tmp; tmp = tmp->below)
1511 if (tmp->type == FORCE) 1530 if (tmp->type == FORCE)
1512 if (tmp->arch->name == dragon_ability_force) 1531 if (tmp->arch->archname == shstr_dragon_ability_force)
1513 abil = tmp; 1532 abil = tmp;
1514 else if (tmp->arch->name == dragon_skin_force) 1533 else if (tmp->arch->archname == shstr_dragon_skin_force)
1515 skin = tmp; 1534 skin = tmp;
1516 1535
1517 /* if the force is missing -> bail out */ 1536 /* if the force is missing -> bail out */
1518 if (abil == NULL) 1537 if (abil == NULL)
1519 return; 1538 return;
… …
1595 */ 1614 */
1596void 1615void
1597player_lvl_adj (object *who, object *op) 1616player_lvl_adj (object *who, object *op)
1598{ 1617{
1599 char buf[MAX_BUF]; 1618 char buf[MAX_BUF];
1619 bool changed = false;
1600 1620
1601 if (!op) /* when rolling stats */ 1621 if (!op) /* when rolling stats */
1602 op = who; 1622 op = who;
1603 1623
1604 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1624 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1605 { 1625 {
1626 changed = true;
1627
1606 op->level++; 1628 op->level++;
1607 1629
1608 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1630 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1609 dragon_level_gain (who); 1631 dragon_level_gain (who);
1610 1632
… …
1614 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1636 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1615 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1637 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1616 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1638 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1617 } 1639 }
1618 1640
1619 who->update_stats ();
1620 if (op->level > 1) 1641 if (op->level > 1)
1621 { 1642 {
1622 if (op->type != PLAYER) 1643 if (op->type != PLAYER)
1644 {
1645 who->contr->play_sound (sound_find ("skill_up"));
1623 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1646 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1647 }
1624 else 1648 else
1649 {
1650 who->contr->play_sound (sound_find ("level_up"));
1625 sprintf (buf, "You are now level %d.", op->level); 1651 sprintf (buf, "You are now level %d.", op->level);
1652 }
1626 1653
1627 if (who) 1654 if (who)
1628 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1655 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1629 } 1656 }
1630
1631 player_lvl_adj (who, op); /* To increase more levels */
1632 } 1657 }
1658
1633 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1659 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1634 { 1660 {
1661 changed = true;
1662
1635 op->level--; 1663 op->level--;
1636 who->update_stats ();
1637 1664
1638 if (op->type != PLAYER) 1665 if (op->type != PLAYER)
1639 { 1666 {
1640 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1667 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1641 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1668 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1642 } 1669 }
1670 }
1643 1671
1644 player_lvl_adj (who, op); /* To decrease more levels */ 1672 if (changed)
1645 } 1673 {
1646 1674 who->update_stats ();
1675 esrv_update_stats (who->contr);
1647 /* check if the spell data has changed */ 1676 /* check if the spell data has changed */
1648 esrv_update_stats (who->contr);
1649 esrv_update_spells (who->contr); 1677 esrv_update_spells (who->contr);
1678 }
1650} 1679}
1651 1680
1652/* 1681/*
1653 * Returns how much experience is needed for a player to become 1682 * Returns how much experience is needed for a player to become
1654 * the given level. level should really never exceed max_level 1683 * the given level. level should really never exceed max_level

Diff Legend

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