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.34 by root, Mon Feb 5 03:01:32 2007 UTC vs.
Revision 1.49 by root, Sat May 12 17:26:51 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
357/* flag is set to 1 if we are applying the object, -1 if we are removing 357/* flag is set to 1 if we are applying the object, -1 if we are removing
358 * the object. 358 * the object.
359 * It is the calling functions responsibilty to check to see if the object 359 * It is the calling functions responsibilty to check to see if the object
360 * can be applied or not. 360 * can be applied or not.
361 * The main purpose of calling this function is the messages that are 361 * The main purpose of calling this function is the messages that are
362 * displayed - fix_player should really always be called after this when 362 * displayed - update_stats should really always be called after this when
363 * removing an object - that is because it is impossible to know if some object 363 * removing an object - that is because it is impossible to know if some object
364 * is the only source of an attacktype or spell attunement, so this function 364 * is the only source of an attacktype or spell attunement, so this function
365 * will clear the bits, but the player may still have some other object 365 * will clear the bits, but the player may still have some other object
366 * that gives them that ability. 366 * that gives them that ability.
367 */ 367 */
… …
398 * that adjust that stat by more than one point, so we need 398 * that adjust that stat by more than one point, so we need
399 * to allow for that. 399 * to allow for that.
400 */ 400 */
401 if (nstat < 1 && i * flag < 0) 401 if (nstat < 1 && i * flag < 0)
402 nstat = 1; 402 nstat = 1;
403 else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j)) 403 else if (nstat > 20 + get_attr_value (&op->arch->clone.stats, j))
404 {
405 nstat = 20 + get_attr_value (&(op->arch->clone.stats), j); 404 nstat = 20 + get_attr_value (&op->arch->clone.stats, j);
406 }
407 405
408 if (nstat != ostat) 406 if (nstat != ostat)
409 { 407 {
410 set_attr_value (&(op->contr->orig_stats), j, nstat); 408 set_attr_value (&op->contr->orig_stats, j, nstat);
411 potion_max = 0; 409 potion_max = 0;
412 } 410 }
413 else if (i) 411 else if (i)
414 { 412 {
415 /* potion is useless - player has already hit the natural maximum */ 413 /* potion is useless - player has already hit the natural maximum */
… …
420 /* This section of code ups the characters normal stats also. I am not 418 /* This section of code ups the characters normal stats also. I am not
421 * sure if this is strictly necessary, being that fix_player probably 419 * sure if this is strictly necessary, being that fix_player probably
422 * recalculates this anyway. 420 * recalculates this anyway.
423 */ 421 */
424 for (j = 0; j < NUM_STATS; j++) 422 for (j = 0; j < NUM_STATS; j++)
425 change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j)); 423 change_attr_value (&op->stats, j, flag * get_attr_value (&tmp->stats, j));
426 424
427 check_stat_bounds (&(op->stats)); 425 check_stat_bounds (&op->stats);
428 } /* end of potion handling code */ 426 } /* end of potion handling code */
429 } 427 }
430 428
431 /* reset attributes that fix_player doesn't reset since it doesn't search 429 /* reset attributes that fix_player doesn't reset since it doesn't search
432 * everything to set 430 * everything to set
433 */ 431 */
434 if (flag == -1) 432 if (flag == -1)
435 { 433 {
436 op->attacktype &= ~tmp->attacktype; 434 op->attacktype &= ~tmp->attacktype;
437 op->path_attuned &= ~tmp->path_attuned; 435 op->path_attuned &= ~tmp->path_attuned;
438 op->path_repelled &= ~tmp->path_repelled; 436 op->path_repelled &= ~tmp->path_repelled;
439 op->path_denied &= ~tmp->path_denied; 437 op->path_denied &= ~tmp->path_denied;
440 /* Presuming here that creatures only have move_type, 438 /* Presuming here that creatures only have move_type,
441 * and not the other move_ fields. 439 * and not the other move_ fields.
442 */ 440 */
443 op->move_type &= ~tmp->move_type; 441 op->move_type &= ~tmp->move_type;
444 } 442 }
445 443
446 /* call fix_player since op object could have whatever attribute due 444 /* call fix_player since op object could have whatever attribute due
447 * to multiple items. if fix_player always has to be called after 445 * to multiple items. if fix_player always has to be called after
448 * change_ability then might as well call it from here 446 * change_ability then might as well call it from here
449 */ 447 */
450 op->update_stats (); 448 op->update_stats ();
451 449
452 /* Fix player won't add the bows ability to the player, so don't 450 /* Fix player won't add the bows ability to the player, so don't
… …
500 * in that case, you don't actually land 498 * in that case, you don't actually land
501 */ 499 */
502 DIFF_MSG (flag, "You soar into the air air!.", 500 DIFF_MSG (flag, "You soar into the air air!.",
503 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); 501 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
504 } 502 }
503
505 if (tmp->move_type & MOVE_SWIM) 504 if (tmp->move_type & MOVE_SWIM)
506 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 505 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
507 506
508 /* Changing move status may mean you are affected by things you weren't before */ 507 /* Changing move status may mean you are affected by things you weren't before */
509 check_move_on (op, op); 508 check_move_on (op, op);
… …
673 672
674/* 673/*
675 * Stat draining by Vick 930307 674 * Stat draining by Vick 930307
676 * (Feeling evil, I made it work as well now. -Frank 8) 675 * (Feeling evil, I made it work as well now. -Frank 8)
677 */ 676 */
678
679void 677void
680object::drain_stat () 678object::drain_stat ()
681{ 679{
682 drain_specific_stat (rndm (NUM_STATS)); 680 drain_specific_stat (rndm (NUM_STATS));
683} 681}
… …
818 * Updates all abilities given by applied objects in the inventory 816 * Updates all abilities given by applied objects in the inventory
819 * of the given object. Note: This function works for both monsters 817 * of the given object. Note: This function works for both monsters
820 * and players; the "player" in the name is purely an archaic inheritance. 818 * and players; the "player" in the name is purely an archaic inheritance.
821 * This functions starts from base values (archetype or player object) 819 * This functions starts from base values (archetype or player object)
822 * and then adjusts them according to what the player has equipped. 820 * and then adjusts them according to what the player has equipped.
823 */ 821 *
824
825/* July 95 - inserted stuff to handle new skills/exp system - b.t. 822 * July 95 - inserted stuff to handle new skills/exp system - b.t.
826 spell system split, grace points now added to system --peterm 823 * spell system split, grace points now added to system --peterm
827 */ 824 */
828
829void 825void
830object::update_stats () 826object::update_stats ()
831{ 827{
832 int i, j; 828 int i, j;
833 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; 829 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;
… …
845 841
846 if (settings.spell_encumbrance == TRUE) 842 if (settings.spell_encumbrance == TRUE)
847 contr->encumbrance = 0; 843 contr->encumbrance = 0;
848 844
849 attacktype = 0; 845 attacktype = 0;
846
850 contr->digestion = 0; 847 contr->digestion = 0;
851 contr->gen_hp = 0; 848 contr->gen_hp = 0;
852 contr->gen_sp = 0; 849 contr->gen_sp = 0;
853 contr->gen_grace = 0; 850 contr->gen_grace = 0;
854 contr->gen_sp_armour = 10; 851 contr->gen_sp_armour = 10;
855 contr->item_power = 0; 852 contr->item_power = 0;
856
857 /* Don't clobber all the range_ values. range_golem otherwise
858 * gets reset for no good reason, and we don't want to reset
859 * range_magic (what spell is readied). These three below
860 * well get filled in based on what the player has equipped.
861 */
862 contr->ranges[range_bow] = NULL;
863 contr->ranges[range_misc] = NULL;
864 contr->ranges[range_skill] = NULL;
865 } 853 }
866 854
867 memcpy (body_used, body_info, sizeof (body_info)); 855 for (int i = NUM_BODY_LOCATIONS; i--; )
856 slot[i].used = slot[i].info;
868 857
869 slaying = 0; 858 slaying = 0;
870 859
871 if (!QUERY_FLAG (this, FLAG_WIZ)) 860 if (!QUERY_FLAG (this, FLAG_WIZ))
872 { 861 {
… …
881 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 870 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
882 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 871 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
883 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 872 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
884 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 873 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
885 874
886 path_attuned = arch->clone.path_attuned; 875 path_attuned = arch->clone.path_attuned;
887 path_repelled = arch->clone.path_repelled; 876 path_repelled = arch->clone.path_repelled;
888 path_denied = arch->clone.path_denied; 877 path_denied = arch->clone.path_denied;
889 glow_radius = arch->clone.glow_radius; 878 glow_radius = arch->clone.glow_radius;
890 move_type = arch->clone.move_type; 879 move_type = arch->clone.move_type;
880
891 chosen_skill = NULL; 881 chosen_skill = 0;
892 882
893 /* initializing resistances from the values in player/monster's 883 /* initializing resistances from the values in player/monster's
894 * archetype clone 884 * archetype clone
895 */ 885 */
896 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 886 memcpy (&resist, &arch->clone.resist, sizeof (resist));
… …
899 { 889 {
900 if (resist[i] > 0) 890 if (resist[i] > 0)
901 prot[i] = resist[i], vuln[i] = 0; 891 prot[i] = resist[i], vuln[i] = 0;
902 else 892 else
903 vuln[i] = -(resist[i]), prot[i] = 0; 893 vuln[i] = -(resist[i]), prot[i] = 0;
894
904 potion_resist[i] = 0; 895 potion_resist[i] = 0;
905 } 896 }
906 897
907 wc = arch->clone.stats.wc; 898 wc = arch->clone.stats.wc;
908 stats.dam = arch->clone.stats.dam; 899 stats.dam = arch->clone.stats.dam;
… …
935 */ 926 */
936 if (tmp->glow_radius > glow_radius) 927 if (tmp->glow_radius > glow_radius)
937 glow_radius = tmp->glow_radius; 928 glow_radius = tmp->glow_radius;
938 929
939 /* This happens because apply_potion calls change_abil with the potion 930 /* This happens because apply_potion calls change_abil with the potion
940 * applied so we can tell the player what chagned. But change_abil 931 * applied so we can tell the player what changed. But change_abil
941 * then calls this function. 932 * then calls this function.
942 */ 933 */
943 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 934 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
944 continue; 935 continue;
945 936
… …
971 * in the praying skill, and the player should always get those. 962 * in the praying skill, and the player should always get those.
972 * It also means we need to put in additional checks for applied below, 963 * It also means we need to put in additional checks for applied below,
973 * because the skill shouldn't count against body positions being used 964 * because the skill shouldn't count against body positions being used
974 * up, etc. 965 * up, etc.
975 */ 966 */
976 if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) || 967 if ((tmp->flag [FLAG_APPLIED]
968 && tmp->type != CONTAINER
969 && tmp->type != CLOSE_CON)
970 || (tmp->type == SKILL
977 (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) 971 && tmp->subtype == SK_PRAYING))
978 { 972 {
979 if (type == PLAYER) 973 if (type == PLAYER)
980 { 974 {
981 if (tmp->type == BOW) 975 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
982 contr->ranges[range_bow] = tmp; 976 if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING))
983 977 continue;
984 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
985 contr->ranges[range_misc] = tmp;
986 978
987 for (i = 0; i < NUM_STATS; i++) 979 for (i = 0; i < NUM_STATS; i++)
988 change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i)); 980 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i));
989 981
990 /* these are the items that currently can change digestion, regeneration, 982 /* these are the items that currently can change digestion, regeneration,
991 * spell point recovery and mana point recovery. Seems sort of an arbitary 983 * spell point recovery and mana point recovery. Seems sort of an arbitary
992 * list, but other items store other info into stats array. 984 * list, but other items store other info into stats array.
993 */ 985 */
994 if ((tmp->type == WEAPON) || 986 if (tmp->type == WEAPON || tmp->type == BOW ||
995 (tmp->type == ARMOUR) || (tmp->type == HELMET) || 987 tmp->type == ARMOUR || tmp->type == HELMET ||
996 (tmp->type == SHIELD) || (tmp->type == RING) || 988 tmp->type == SHIELD || tmp->type == RING ||
997 (tmp->type == BOOTS) || (tmp->type == GLOVES) || 989 tmp->type == BOOTS || tmp->type == GLOVES ||
998 (tmp->type == AMULET) || (tmp->type == GIRDLE) || 990 tmp->type == AMULET || tmp->type == GIRDLE ||
999 (tmp->type == BRACERS) || (tmp->type == CLOAK) || 991 tmp->type == BRACERS || tmp->type == CLOAK ||
1000 (tmp->type == DISEASE) || (tmp->type == FORCE) || 992 tmp->type == DISEASE || tmp->type == FORCE ||
1001 (tmp->type == SKILL)) 993 tmp->type == SKILL)
1002 { 994 {
1003 contr->digestion += tmp->stats.food; 995 contr->digestion += tmp->stats.food;
1004 contr->gen_hp += tmp->stats.hp; 996 contr->gen_hp += tmp->stats.hp;
1005 contr->gen_sp += tmp->stats.sp; 997 contr->gen_sp += tmp->stats.sp;
1006 contr->gen_grace += tmp->stats.grace; 998 contr->gen_grace += tmp->stats.grace;
1007 contr->gen_sp_armour += tmp->gen_sp_armour; 999 contr->gen_sp_armour += tmp->gen_sp_armour;
1008 contr->item_power += tmp->item_power; 1000 contr->item_power += tmp->item_power;
1009 } 1001 }
1010 } /* if this is a player */ 1002 } /* if this is a player */
1003 else
1004 {
1005 if (tmp->type == WEAPON)
1006 current_weapon = tmp;
1007 }
1011 1008
1012 /* Update slots used for items */ 1009 /* Update slots used for items */
1013 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 1010 if (QUERY_FLAG (tmp, FLAG_APPLIED))
1014 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1011 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1015 body_used[i] += tmp->body_info[i]; 1012 slot[i].used += tmp->slot[i].info;
1016 1013
1017 if (tmp->type == SYMPTOM) 1014 if (tmp->type == SYMPTOM)
1018 { 1015 {
1019 speed_reduce_from_disease = tmp->last_sp / 100.0; 1016 speed_reduce_from_disease = tmp->last_sp / 100.f;
1017
1020 if (speed_reduce_from_disease == 0) 1018 if (speed_reduce_from_disease == 0)
1021 speed_reduce_from_disease = 1; 1019 speed_reduce_from_disease = 1;
1022 } 1020 }
1023 1021
1024 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 1022 /* Pos. and neg. protections are counted seperate (-> pro/vuln).
… …
1046 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 1044 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1047 } 1045 }
1048 } 1046 }
1049 1047
1050 /* There may be other things that should not adjust the attacktype */ 1048 /* There may be other things that should not adjust the attacktype */
1051 if (tmp->type != BOW && tmp->type != SYMPTOM) 1049 if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM)
1050 || current_weapon == tmp)
1051 {
1052 attacktype |= tmp->attacktype; 1052 attacktype |= tmp->attacktype;
1053
1054 path_attuned |= tmp->path_attuned; 1053 path_attuned |= tmp->path_attuned;
1055 path_repelled |= tmp->path_repelled; 1054 path_repelled |= tmp->path_repelled;
1056 path_denied |= tmp->path_denied; 1055 path_denied |= tmp->path_denied;
1056 move_type |= tmp->move_type;
1057 stats.luck += tmp->stats.luck; 1057 stats.luck += tmp->stats.luck;
1058 move_type |= tmp->move_type; 1058 }
1059 1059
1060 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 1060 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1061 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL); 1061 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1062 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE); 1062 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1063 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH); 1063 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
… …
1076 1076
1077 if (tmp->stats.exp && tmp->type != SKILL) 1077 if (tmp->stats.exp && tmp->type != SKILL)
1078 { 1078 {
1079 if (tmp->stats.exp > 0) 1079 if (tmp->stats.exp > 0)
1080 { 1080 {
1081 added_speed += (float) tmp->stats.exp / 3.0; 1081 added_speed += tmp->stats.exp / 3.f;
1082 bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0; 1082 bonus_speed += tmp->stats.exp / 3.f + 1.f;
1083 } 1083 }
1084 else 1084 else
1085 added_speed += (float) tmp->stats.exp; 1085 added_speed += tmp->stats.exp;
1086 } 1086 }
1087 1087
1088 switch (tmp->type) 1088 switch (tmp->type)
1089 { 1089 {
1090#if 0
1091 case WAND:
1092 case ROD:
1093 case HORN:
1094 if (type != PLAYER || current_weapon == tmp)
1095 chosen_skill = tmp;
1096 break;
1097#endif
1098
1090 /* skills modifying the character -b.t. */ 1099 /* skills modifying the character -b.t. */
1091 /* for all skills and skill granting objects */ 1100 /* for all skills and skill granting objects */
1092 case SKILL: 1101 case SKILL:
1093 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1102 if (!QUERY_FLAG (tmp, FLAG_APPLIED))
1094 break; 1103 break;
… …
1102 chosen_skill = tmp; 1111 chosen_skill = tmp;
1103 1112
1104 if (tmp->stats.dam > 0) 1113 if (tmp->stats.dam > 0)
1105 { /* skill is a 'weapon' */ 1114 { /* skill is a 'weapon' */
1106 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1115 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1107 weapon_speed = (int) WEAPON_SPEED (tmp); 1116 weapon_speed = WEAPON_SPEED (tmp);
1108 1117
1109 if (weapon_speed < 0) 1118 if (weapon_speed < 0)
1110 weapon_speed = 0; 1119 weapon_speed = 0;
1111 1120
1112 weapon_weight = tmp->weight; 1121 weapon_weight = tmp->weight;
… …
1115 if (tmp->magic) 1124 if (tmp->magic)
1116 stats.dam += tmp->magic; 1125 stats.dam += tmp->magic;
1117 } 1126 }
1118 1127
1119 if (tmp->stats.wc) 1128 if (tmp->stats.wc)
1120 wc -= (tmp->stats.wc + tmp->magic); 1129 wc -= tmp->stats.wc + tmp->magic;
1121 1130
1122 if (tmp->slaying != NULL) 1131 if (tmp->slaying)
1123 slaying = tmp->slaying; 1132 slaying = tmp->slaying;
1124 1133
1125 if (tmp->stats.ac) 1134 if (tmp->stats.ac)
1126 ac -= (tmp->stats.ac + tmp->magic); 1135 ac -= tmp->stats.ac + tmp->magic;
1127 1136
1128 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1137 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1129 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1138 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1130
1131 if (type == PLAYER)
1132 contr->ranges[range_skill] = this;
1133 1139
1134 break; 1140 break;
1135 1141
1136 case SKILL_TOOL: 1142 case SKILL_TOOL:
1137 if (chosen_skill) 1143 if (chosen_skill)
1138 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1144 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1139 1145
1140 chosen_skill = tmp; 1146 chosen_skill = tmp;
1141
1142 if (type == PLAYER)
1143 contr->ranges[range_skill] = this;
1144 break; 1147 break;
1145 1148
1146 case SHIELD: 1149 case SHIELD:
1147 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1150 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1148 contr->encumbrance += (int) tmp->weight / 2000; 1151 contr->encumbrance += (int) tmp->weight / 2000;
… …
1152 case HELMET: 1155 case HELMET:
1153 case BOOTS: 1156 case BOOTS:
1154 case GLOVES: 1157 case GLOVES:
1155 case CLOAK: 1158 case CLOAK:
1156 if (tmp->stats.wc) 1159 if (tmp->stats.wc)
1157 wc -= (tmp->stats.wc + tmp->magic); 1160 wc -= tmp->stats.wc + tmp->magic;
1158 1161
1159 if (tmp->stats.dam) 1162 if (tmp->stats.dam)
1160 stats.dam += (tmp->stats.dam + tmp->magic); 1163 stats.dam += tmp->stats.dam + tmp->magic;
1161 1164
1162 if (tmp->stats.ac) 1165 if (tmp->stats.ac)
1163 ac -= (tmp->stats.ac + tmp->magic); 1166 ac -= tmp->stats.ac + tmp->magic;
1164 1167
1165 break; 1168 break;
1166 1169
1170 case BOW:
1167 case WEAPON: 1171 case WEAPON:
1172 if (type != PLAYER || current_weapon == tmp)
1173 {
1168 wc -= (tmp->stats.wc + tmp->magic); 1174 wc -= tmp->stats.wc + tmp->magic;
1169 1175
1170 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1176 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1171 ac -= tmp->stats.ac + tmp->magic; 1177 ac -= tmp->stats.ac + tmp->magic;
1172 1178
1173 stats.dam += (tmp->stats.dam + tmp->magic); 1179 stats.dam += tmp->stats.dam + tmp->magic;
1174 weapon_weight = tmp->weight; 1180 weapon_weight = tmp->weight;
1175 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1181 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1176 1182
1177 if (weapon_speed < 0) 1183 if (weapon_speed < 0)
1178 weapon_speed = 0; 1184 weapon_speed = 0;
1179 1185
1180 slaying = tmp->slaying; 1186 slaying = tmp->slaying;
1187
1181 /* If there is desire that two handed weapons should do 1188 /* If there is desire that two handed weapons should do
1182 * extra strength damage, this is where the code should 1189 * extra strength damage, this is where the code should
1183 * go. 1190 * go.
1184 */ 1191 */
1185 current_weapon = tmp; 1192
1186 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1193 if (type == PLAYER)
1194 if (settings.spell_encumbrance)
1187 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1195 contr->encumbrance += tmp->weight * 3 / 1000;
1196 }
1188 1197
1189 break; 1198 break;
1190 1199
1191 case ARMOUR: /* Only the best of these three are used: */ 1200 case ARMOUR: /* Only the best of these three are used: */
1192 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1201 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1193 contr->encumbrance += (int) tmp->weight / 1000; 1202 contr->encumbrance += tmp->weight / 1000;
1194 1203
1195 case BRACERS: 1204 case BRACERS:
1196 case FORCE: 1205 case FORCE:
1197 if (tmp->stats.wc) 1206 if (tmp->stats.wc)
1198 { 1207 {
… …
1220 wc -= (tmp->stats.wc + tmp->magic); 1229 wc -= (tmp->stats.wc + tmp->magic);
1221 1230
1222 if (tmp->stats.ac) 1231 if (tmp->stats.ac)
1223 ac -= (tmp->stats.ac + tmp->magic); 1232 ac -= (tmp->stats.ac + tmp->magic);
1224 1233
1225 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max) 1234 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max)
1226 max = ARMOUR_SPEED (tmp) / 10.0; 1235 max = ARMOUR_SPEED (tmp) / 10.f;
1227 1236
1228 break; 1237 break;
1229 } /* switch tmp->type */ 1238 } /* switch tmp->type */
1230 } /* item is equipped */ 1239 } /* item is equipped */
1231 } /* for loop of items */ 1240 } /* for loop of items */
… …
1299 1308
1300 if (mana_obj == this && type == PLAYER) 1309 if (mana_obj == this && type == PLAYER)
1301 stats.maxsp = 1; 1310 stats.maxsp = 1;
1302 else 1311 else
1303 { 1312 {
1304 sp_tmp = 0.0; 1313 sp_tmp = 0.f;
1305 1314
1306 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1315 for (i = 1; i <= mana_obj->level && i <= 10; i++)
1307 { 1316 {
1308 float stmp; 1317 float stmp;
1309 1318
1310 /* Got some extra bonus at first level */ 1319 /* Got some extra bonus at first level */
1311 if (i < 2) 1320 if (i < 2)
1312 stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0); 1321 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1313 else 1322 else
1314 stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0; 1323 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1315 1324
1316 if (stmp < 1.0) 1325 if (stmp < 1.f)
1317 stmp = 1.0; 1326 stmp = 1.f;
1318 1327
1319 sp_tmp += stmp; 1328 sp_tmp += stmp;
1320 } 1329 }
1321 1330
1322 stats.maxsp = (int) sp_tmp; 1331 stats.maxsp = (sint16)sp_tmp;
1323 1332
1324 for (i = 11; i <= mana_obj->level; i++) 1333 for (i = 11; i <= mana_obj->level; i++)
1325 stats.maxsp += 2; 1334 stats.maxsp += 2;
1326 } 1335 }
1327 /* Characters can get their sp supercharged via rune of transferrance */ 1336 /* Characters can get their sp supercharged via rune of transferrance */
… …
1339 /* store grace in a float - this way, the divisions below don't create 1348 /* store grace in a float - this way, the divisions below don't create
1340 * big jumps when you go from level to level - with int's, it then 1349 * big jumps when you go from level to level - with int's, it then
1341 * becomes big jumps when the sums of the bonuses jump to the next 1350 * becomes big jumps when the sums of the bonuses jump to the next
1342 * step of 8 - with floats, even fractional ones are useful. 1351 * step of 8 - with floats, even fractional ones are useful.
1343 */ 1352 */
1344 sp_tmp = 0.0; 1353 sp_tmp = 0.f;
1345 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1354 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)
1346 { 1355 {
1347 float grace_tmp = 0.0; 1356 float grace_tmp = 0.f;
1348 1357
1349 /* Got some extra bonus at first level */ 1358 /* Got some extra bonus at first level */
1350 if (i < 2) 1359 if (i < 2)
1351 grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] + 1360 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1352 2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1353 else 1361 else
1354 grace_tmp = (float) contr->levgrace[i]
1355 + ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0; 1362 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1356 1363
1357 if (grace_tmp < 1.0) 1364 if (grace_tmp < 1.f)
1358 grace_tmp = 1.0; 1365 grace_tmp = 1.f;
1359 1366
1360 sp_tmp += grace_tmp; 1367 sp_tmp += grace_tmp;
1361 } 1368 }
1362 1369
1363 stats.maxgrace = (int) sp_tmp; 1370 stats.maxgrace = (sint16)sp_tmp;
1364 1371
1365 /* two grace points per level after 11 */ 1372 /* two grace points per level after 11 */
1366 for (i = 11; i <= grace_obj->level; i++) 1373 for (i = 11; i <= grace_obj->level; i++)
1367 stats.maxgrace += 2; 1374 stats.maxgrace += 2;
1368 } 1375 }
… …
1388 * monster bonus the same as before. -b.t. 1395 * monster bonus the same as before. -b.t.
1389 */ 1396 */
1390 1397
1391 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1398 if (type == PLAYER && wc_obj && wc_obj->level > 1)
1392 { 1399 {
1393 wc -= (wc_obj->level + thaco_bonus[stats.Str]); 1400 wc -= wc_obj->level + thaco_bonus[stats.Str];
1401
1394 for (i = 1; i < wc_obj->level; i++) 1402 for (i = 1; i < wc_obj->level; i++)
1395 { 1403 {
1396 /* addtional wc every 6 levels */ 1404 /* addtional wc every 6 levels */
1397 if (!(i % 6)) 1405 if (!(i % 6))
1398 wc--; 1406 wc--;
1407
1399 /* addtional dam every 4 levels. */ 1408 /* addtional dam every 4 levels. */
1400 if (!(i % 4) && (dam_bonus[stats.Str] >= 0)) 1409 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1401 stats.dam += (1 + (dam_bonus[stats.Str] / 5)); 1410 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1402 } 1411 }
1403 } 1412 }
1404 else 1413 else
1405 wc -= (level + thaco_bonus[stats.Str]); 1414 wc -= level + thaco_bonus[stats.Str];
1406 1415
1407 stats.dam += dam_bonus[stats.Str]; 1416 stats.dam += dam_bonus[stats.Str];
1408 1417
1409 if (stats.dam < 1) 1418 if (stats.dam < 1)
1410 stats.dam = 1; 1419 stats.dam = 1;
1411 1420
1412 speed = 1.0 + speed_bonus[stats.Dex]; 1421 speed = 1.f + speed_bonus[stats.Dex];
1413 1422
1414 if (settings.search_items && contr->search_str[0]) 1423 if (settings.search_items && contr->search_str[0])
1415 speed -= 1; 1424 speed -= 1;
1416 1425
1417 if (attacktype == 0) 1426 if (attacktype == 0)
1418 attacktype = arch->clone.attacktype; 1427 attacktype = arch->clone.attacktype;
1419 1428
1420 } /* End if player */ 1429 } /* End if player */
1421 1430
1422 if (added_speed >= 0) 1431 if (added_speed >= 0)
1423 speed += added_speed / 10.0; 1432 speed += added_speed / 10.f;
1424 else /* Something wrong here...: */ 1433 else /* Something wrong here...: */
1425 speed /= (float) (1.0 - added_speed); 1434 speed /= 1.f - added_speed;
1426 1435
1427 /* Max is determined by armour */ 1436 /* Max is determined by armour */
1428 if (speed > max) 1437 if (speed > max)
1429 speed = max; 1438 speed = max;
1430 1439
… …
1435 * weight limit, then player suffers a speed reduction based on how 1444 * weight limit, then player suffers a speed reduction based on how
1436 * much above he is, and what is max carry is 1445 * much above he is, and what is max carry is
1437 */ 1446 */
1438 f = (carrying / 1000) - max_carry[stats.Str]; 1447 f = (carrying / 1000) - max_carry[stats.Str];
1439 if (f > 0) 1448 if (f > 0)
1440 speed = speed / (1.0 + f / max_carry[stats.Str]); 1449 speed = speed / (1.f + f / max_carry[stats.Str]);
1441 } 1450 }
1442 1451
1443 speed += bonus_speed / 10.0; /* Not affected by limits */ 1452 speed += bonus_speed / 10.f; /* Not affected by limits */
1444 1453
1445 /* Put a lower limit on speed. Note with this speed, you move once every 1454 /* Put a lower limit on speed. Note with this speed, you move once every
1446 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1455 * 100 ticks or so. This amounts to once every 12 seconds of realtime.
1447 */ 1456 */
1448 speed = speed * speed_reduce_from_disease; 1457 speed = speed * speed_reduce_from_disease;
1449 1458
1450 if (speed < 0.01 && type == PLAYER) 1459 if (speed < 0.01f && type == PLAYER)
1451 speed = 0.01; 1460 speed = 0.01f;
1452 1461
1453 if (type == PLAYER) 1462 if (type == PLAYER)
1454 { 1463 {
1455 float M, W, s, D, K, S, M2;
1456
1457 /* (This formula was made by vidarl@ifi.uio.no) 1464 /* (This formula was made by vidarl@ifi.uio.no)
1458 * Note that we never used these values again - basically 1465 * Note that we never used these values again - basically
1459 * all of these could be subbed into one big equation, but 1466 * all of these could be subbed into one big equation, but
1460 * that would just be a real pain to read. 1467 * that would just be a real pain to read.
1461 */ 1468 */
1462 M = (max_carry[stats.Str] - 121) / 121.0; 1469 float M = (max_carry[stats.Str] - 121) / 121.f;
1463 M2 = max_carry[stats.Str] / 100.0; 1470 float M2 = max_carry[stats.Str] / 100.f;
1464 W = weapon_weight / 20000.0; 1471 float W = weapon_weight / 20000.f;
1465 s = 2 - weapon_speed / 10.0; 1472 float s = 2 - weapon_speed / 10.f;
1466 D = (stats.Dex - 14) / 14.0; 1473 float D = (stats.Dex - 14) / 14.f;
1467 K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0; 1474 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1475
1468 K *= (4 + level) / (float) (6 + level) * 1.2; 1476 K *= (4 + level) *1.2f / (6 + level);
1477
1469 if (K <= 0) 1478 if (K <= 0.f)
1470 K = 0.01; 1479 K = 0.01f;
1480
1471 S = speed / (K * s); 1481 float S = speed / (K * s);
1482
1472 contr->weapon_sp = S; 1483 contr->weapon_sp = S;
1473 } 1484 }
1474 1485
1475 /* I want to limit the power of small monsters with big weapons: */ 1486 /* I want to limit the power of small monsters with big weapons: */
1476 if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3) 1487 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)
1477 stats.dam = arch->clone.stats.dam * 3; 1488 stats.dam = arch->clone.stats.dam * 3;
1478 1489
1479 /* Prevent overflows of wc - best you can get is ABS(120) - this 1490 /* Prevent overflows of wc - best you can get is ABS(120) - this
1480 * should be more than enough - remember, AC is also in 8 bits, 1491 * should be more than enough - remember, AC is also in 8 bits,
1481 * so its value is the same. 1492 * so its value is the same.
… …
1514 if (type == PLAYER) 1525 if (type == PLAYER)
1515 { 1526 {
1516 esrv_update_stats (contr); 1527 esrv_update_stats (contr);
1517 esrv_update_spells (contr); 1528 esrv_update_spells (contr);
1518 } 1529 }
1530
1531 // update the mapspace, if we are on a map
1532 if (!flag [FLAG_REMOVED] && map)
1533 map->at (x, y).flags_ = 0;
1519} 1534}
1520 1535
1521/* 1536/*
1522 * Returns true if the given player is a legal class. 1537 * Returns true if the given player is a legal class.
1523 * The function to add and remove class-bonuses to the stats doesn't 1538 * The function to add and remove class-bonuses to the stats doesn't
… …
1526 * false otherwise. 1541 * false otherwise.
1527 */ 1542 */
1528int 1543int
1529allowed_class (const object *op) 1544allowed_class (const object *op)
1530{ 1545{
1531 return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 && 1546 return op->stats.Dex > 0
1532 op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0; 1547 && op->stats.Str > 0
1548 && op->stats.Con > 0
1549 && op->stats.Int > 0
1550 && op->stats.Wis > 0
1551 && op->stats.Pow > 0
1552 && op->stats.Cha > 0;
1533} 1553}
1534 1554
1535/* 1555/*
1536 * set the new dragon name after gaining levels or 1556 * set the new dragon name after gaining levels or
1537 * changing ability focus (later this can be extended to 1557 * changing ability focus (later this can be extended to
… …
1759sint64 1779sint64
1760level_exp (int level, double expmul) 1780level_exp (int level, double expmul)
1761{ 1781{
1762 if (level > settings.max_level) 1782 if (level > settings.max_level)
1763 return (sint64) (expmul * levels[settings.max_level]); 1783 return (sint64) (expmul * levels[settings.max_level]);
1784
1764 return (sint64) (expmul * levels[level]); 1785 return (sint64) (expmul * levels[level]);
1765} 1786}
1766 1787
1767/* 1788/*
1768 * Ensure that the permanent experience requirements in an exp object are met. 1789 * Ensure that the permanent experience requirements in an exp object are met.
… …
1805 sint64 limit, exp_to_add; 1826 sint64 limit, exp_to_add;
1806 int i; 1827 int i;
1807 1828
1808 /* prevents some forms of abuse. */ 1829 /* prevents some forms of abuse. */
1809 if (op->contr->braced) 1830 if (op->contr->braced)
1810 exp = exp / 5; 1831 exp /= 5;
1811 1832
1812 /* Try to find the matching skill. 1833 /* Try to find the matching skill.
1813 * We do a shortcut/time saving mechanism first - see if it matches 1834 * We do a shortcut/time saving mechanism first - see if it matches
1814 * chosen_skill. This means we don't need to search through 1835 * chosen_skill. This means we don't need to search through
1815 * the players inventory. 1836 * the players inventory.
1816 */ 1837 */
1817 if (skill_name) 1838 if (skill_name)
1818 { 1839 {
1819 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1840 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))
… …
1950 del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction)); 1971 del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));
1951 tmp->stats.exp -= del_exp; 1972 tmp->stats.exp -= del_exp;
1952 player_lvl_adj (op, tmp); 1973 player_lvl_adj (op, tmp);
1953 } 1974 }
1954 } 1975 }
1976
1955 if (flag != SK_SUBTRACT_SKILL_EXP) 1977 if (flag != SK_SUBTRACT_SKILL_EXP)
1956 { 1978 {
1957 del_exp = check_exp_loss (op, exp); 1979 del_exp = check_exp_loss (op, exp);
1958 op->stats.exp -= del_exp; 1980 op->stats.exp -= del_exp;
1959 player_lvl_adj (op, NULL); 1981 player_lvl_adj (op, NULL);
1960 } 1982 }
1961} 1983}
1962
1963
1964 1984
1965/* change_exp() - changes experience to a player/monster. This 1985/* change_exp() - changes experience to a player/monster. This
1966 * does bounds checking to make sure we don't overflow the max exp. 1986 * does bounds checking to make sure we don't overflow the max exp.
1967 * 1987 *
1968 * The exp passed is typically not modified much by this function - 1988 * The exp passed is typically not modified much by this function -
1969 * it is assumed the caller has modified the exp as needed. 1989 * it is assumed the caller has modified the exp as needed.
1970 * skill_name is the skill that should get the exp added. 1990 * skill_name is the skill that should get the exp added.
1971 * flag is what to do if player doesn't have the skill. 1991 * flag is what to do if player doesn't have the skill.
1972 * these last two values are only used for players. 1992 * these last two values are only used for players.
1973 */ 1993 */
1974
1975void 1994void
1976change_exp (object *op, sint64 exp, const char *skill_name, int flag) 1995change_exp (object *op, sint64 exp, const char *skill_name, int flag)
1977{ 1996{
1978
1979#ifdef EXP_DEBUG 1997#ifdef EXP_DEBUG
1980 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp); 1998 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1981#endif 1999#endif
1982 2000
1983 /* safety */ 2001 /* safety */
… …
2032 2050
2033/* Applies a death penalty experience, the size of this is defined by the 2051/* Applies a death penalty experience, the size of this is defined by the
2034 * settings death_penalty_percentage and death_penalty_levels, and by the 2052 * settings death_penalty_percentage and death_penalty_levels, and by the
2035 * amount of permenent experience, whichever gives the lowest loss. 2053 * amount of permenent experience, whichever gives the lowest loss.
2036 */ 2054 */
2037
2038void 2055void
2039apply_death_exp_penalty (object *op) 2056apply_death_exp_penalty (object *op)
2040{ 2057{
2041 object *tmp; 2058 object *tmp;
2042 sint64 loss; 2059 sint64 loss;

Diff Legend

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