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.36 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.46 by root, Tue May 1 05:48:19 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 *
… …
843 843
844 if (settings.spell_encumbrance == TRUE) 844 if (settings.spell_encumbrance == TRUE)
845 contr->encumbrance = 0; 845 contr->encumbrance = 0;
846 846
847 attacktype = 0; 847 attacktype = 0;
848
848 contr->digestion = 0; 849 contr->digestion = 0;
849 contr->gen_hp = 0; 850 contr->gen_hp = 0;
850 contr->gen_sp = 0; 851 contr->gen_sp = 0;
851 contr->gen_grace = 0; 852 contr->gen_grace = 0;
852 contr->gen_sp_armour = 10; 853 contr->gen_sp_armour = 10;
853 contr->item_power = 0; 854 contr->item_power = 0;
854
855 /* Don't clobber all the range_ values. range_golem otherwise
856 * gets reset for no good reason, and we don't want to reset
857 * range_magic (what spell is readied). These three below
858 * well get filled in based on what the player has equipped.
859 */
860 contr->ranges[range_bow] = 0;
861 contr->ranges[range_misc] = 0;
862 contr->ranges[range_skill] = 0;
863 } 855 }
864 856
865 memcpy (body_used, body_info, sizeof (body_info)); 857 memcpy (body_used, body_info, sizeof (body_info));
866 858
867 slaying = 0; 859 slaying = 0;
… …
879 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 871 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
880 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 872 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
881 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 873 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
882 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 874 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
883 875
884 path_attuned = arch->clone.path_attuned; 876 path_attuned = arch->clone.path_attuned;
885 path_repelled = arch->clone.path_repelled; 877 path_repelled = arch->clone.path_repelled;
886 path_denied = arch->clone.path_denied; 878 path_denied = arch->clone.path_denied;
887 glow_radius = arch->clone.glow_radius; 879 glow_radius = arch->clone.glow_radius;
888 move_type = arch->clone.move_type; 880 move_type = arch->clone.move_type;
881
889 chosen_skill = NULL; 882 chosen_skill = 0;
890 883
891 /* initializing resistances from the values in player/monster's 884 /* initializing resistances from the values in player/monster's
892 * archetype clone 885 * archetype clone
893 */ 886 */
894 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 887 memcpy (&resist, &arch->clone.resist, sizeof (resist));
… …
897 { 890 {
898 if (resist[i] > 0) 891 if (resist[i] > 0)
899 prot[i] = resist[i], vuln[i] = 0; 892 prot[i] = resist[i], vuln[i] = 0;
900 else 893 else
901 vuln[i] = -(resist[i]), prot[i] = 0; 894 vuln[i] = -(resist[i]), prot[i] = 0;
895
902 potion_resist[i] = 0; 896 potion_resist[i] = 0;
903 } 897 }
904 898
905 wc = arch->clone.stats.wc; 899 wc = arch->clone.stats.wc;
906 stats.dam = arch->clone.stats.dam; 900 stats.dam = arch->clone.stats.dam;
… …
933 */ 927 */
934 if (tmp->glow_radius > glow_radius) 928 if (tmp->glow_radius > glow_radius)
935 glow_radius = tmp->glow_radius; 929 glow_radius = tmp->glow_radius;
936 930
937 /* This happens because apply_potion calls change_abil with the potion 931 /* This happens because apply_potion calls change_abil with the potion
938 * applied so we can tell the player what chagned. But change_abil 932 * applied so we can tell the player what changed. But change_abil
939 * then calls this function. 933 * then calls this function.
940 */ 934 */
941 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 935 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
942 continue; 936 continue;
943 937
… …
969 * in the praying skill, and the player should always get those. 963 * in the praying skill, and the player should always get those.
970 * It also means we need to put in additional checks for applied below, 964 * It also means we need to put in additional checks for applied below,
971 * because the skill shouldn't count against body positions being used 965 * because the skill shouldn't count against body positions being used
972 * up, etc. 966 * up, etc.
973 */ 967 */
974 if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) || 968 if ((QUERY_FLAG (tmp, FLAG_APPLIED)
969 && tmp->type != CONTAINER
970 && tmp->type != CLOSE_CON)
971 || (tmp->type == SKILL
975 (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) 972 && tmp->subtype == SK_PRAYING))
976 { 973 {
977 if (type == PLAYER) 974 if (type == PLAYER)
978 { 975 {
979 if (tmp->type == BOW)
980 contr->ranges[range_bow] = tmp;
981
982 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 976 if ((tmp->type == WEAPON || tmp->type == BOW)
983 contr->ranges[range_misc] = tmp; 977 && tmp != current_weapon)
978 continue;
984 979
985 for (i = 0; i < NUM_STATS; i++) 980 for (i = 0; i < NUM_STATS; i++)
986 change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i)); 981 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i));
987 982
988 /* these are the items that currently can change digestion, regeneration, 983 /* these are the items that currently can change digestion, regeneration,
989 * spell point recovery and mana point recovery. Seems sort of an arbitary 984 * spell point recovery and mana point recovery. Seems sort of an arbitary
990 * list, but other items store other info into stats array. 985 * list, but other items store other info into stats array.
991 */ 986 */
992 if ((tmp->type == WEAPON) || 987 if ((tmp->type == WEAPON) || (tmp->type == BOW) ||
993 (tmp->type == ARMOUR) || (tmp->type == HELMET) || 988 (tmp->type == ARMOUR) || (tmp->type == HELMET) ||
994 (tmp->type == SHIELD) || (tmp->type == RING) || 989 (tmp->type == SHIELD) || (tmp->type == RING) ||
995 (tmp->type == BOOTS) || (tmp->type == GLOVES) || 990 (tmp->type == BOOTS) || (tmp->type == GLOVES) ||
996 (tmp->type == AMULET) || (tmp->type == GIRDLE) || 991 (tmp->type == AMULET) || (tmp->type == GIRDLE) ||
997 (tmp->type == BRACERS) || (tmp->type == CLOAK) || 992 (tmp->type == BRACERS) || (tmp->type == CLOAK) ||
… …
1004 contr->gen_grace += tmp->stats.grace; 999 contr->gen_grace += tmp->stats.grace;
1005 contr->gen_sp_armour += tmp->gen_sp_armour; 1000 contr->gen_sp_armour += tmp->gen_sp_armour;
1006 contr->item_power += tmp->item_power; 1001 contr->item_power += tmp->item_power;
1007 } 1002 }
1008 } /* if this is a player */ 1003 } /* if this is a player */
1004 else
1005 {
1006 if (tmp->type == WEAPON)
1007 current_weapon = tmp;
1008 }
1009 1009
1010 /* Update slots used for items */ 1010 /* Update slots used for items */
1011 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 1011 if (QUERY_FLAG (tmp, FLAG_APPLIED))
1012 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1012 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1013 body_used[i] += tmp->body_info[i]; 1013 body_used[i] += tmp->body_info[i];
1014 1014
1015 if (tmp->type == SYMPTOM) 1015 if (tmp->type == SYMPTOM)
1016 { 1016 {
1017 speed_reduce_from_disease = tmp->last_sp / 100.0; 1017 speed_reduce_from_disease = tmp->last_sp / 100.f;
1018
1018 if (speed_reduce_from_disease == 0) 1019 if (speed_reduce_from_disease == 0)
1019 speed_reduce_from_disease = 1; 1020 speed_reduce_from_disease = 1;
1020 } 1021 }
1021 1022
1022 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 1023 /* Pos. and neg. protections are counted seperate (-> pro/vuln).
… …
1044 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 1045 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1045 } 1046 }
1046 } 1047 }
1047 1048
1048 /* There may be other things that should not adjust the attacktype */ 1049 /* There may be other things that should not adjust the attacktype */
1049 if (tmp->type != BOW && tmp->type != SYMPTOM) 1050 if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM)
1051 || current_weapon == tmp)
1052 {
1050 attacktype |= tmp->attacktype; 1053 attacktype |= tmp->attacktype;
1051
1052 path_attuned |= tmp->path_attuned; 1054 path_attuned |= tmp->path_attuned;
1053 path_repelled |= tmp->path_repelled; 1055 path_repelled |= tmp->path_repelled;
1054 path_denied |= tmp->path_denied; 1056 path_denied |= tmp->path_denied;
1057 move_type |= tmp->move_type;
1055 stats.luck += tmp->stats.luck; 1058 stats.luck += tmp->stats.luck;
1056 move_type |= tmp->move_type; 1059 }
1057 1060
1058 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 1061 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1059 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL); 1062 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1060 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE); 1063 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1061 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH); 1064 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
… …
1074 1077
1075 if (tmp->stats.exp && tmp->type != SKILL) 1078 if (tmp->stats.exp && tmp->type != SKILL)
1076 { 1079 {
1077 if (tmp->stats.exp > 0) 1080 if (tmp->stats.exp > 0)
1078 { 1081 {
1079 added_speed += (float) tmp->stats.exp / 3.0; 1082 added_speed += tmp->stats.exp / 3.f;
1080 bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0; 1083 bonus_speed += tmp->stats.exp / 3.f + 1.f;
1081 } 1084 }
1082 else 1085 else
1083 added_speed += (float) tmp->stats.exp; 1086 added_speed += tmp->stats.exp;
1084 } 1087 }
1085 1088
1086 switch (tmp->type) 1089 switch (tmp->type)
1087 { 1090 {
1091#if 0
1092 case WAND:
1093 case ROD:
1094 case HORN:
1095 if (type != PLAYER || current_weapon == tmp)
1096 chosen_skill = tmp;
1097 break;
1098#endif
1099
1088 /* skills modifying the character -b.t. */ 1100 /* skills modifying the character -b.t. */
1089 /* for all skills and skill granting objects */ 1101 /* for all skills and skill granting objects */
1090 case SKILL: 1102 case SKILL:
1091 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1103 if (!QUERY_FLAG (tmp, FLAG_APPLIED))
1092 break; 1104 break;
… …
1100 chosen_skill = tmp; 1112 chosen_skill = tmp;
1101 1113
1102 if (tmp->stats.dam > 0) 1114 if (tmp->stats.dam > 0)
1103 { /* skill is a 'weapon' */ 1115 { /* skill is a 'weapon' */
1104 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1116 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1105 weapon_speed = (int) WEAPON_SPEED (tmp); 1117 weapon_speed = WEAPON_SPEED (tmp);
1106 1118
1107 if (weapon_speed < 0) 1119 if (weapon_speed < 0)
1108 weapon_speed = 0; 1120 weapon_speed = 0;
1109 1121
1110 weapon_weight = tmp->weight; 1122 weapon_weight = tmp->weight;
… …
1113 if (tmp->magic) 1125 if (tmp->magic)
1114 stats.dam += tmp->magic; 1126 stats.dam += tmp->magic;
1115 } 1127 }
1116 1128
1117 if (tmp->stats.wc) 1129 if (tmp->stats.wc)
1118 wc -= (tmp->stats.wc + tmp->magic); 1130 wc -= tmp->stats.wc + tmp->magic;
1119 1131
1120 if (tmp->slaying != NULL) 1132 if (tmp->slaying)
1121 slaying = tmp->slaying; 1133 slaying = tmp->slaying;
1122 1134
1123 if (tmp->stats.ac) 1135 if (tmp->stats.ac)
1124 ac -= (tmp->stats.ac + tmp->magic); 1136 ac -= tmp->stats.ac + tmp->magic;
1125 1137
1126 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1138 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1127 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1139 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1128
1129 if (type == PLAYER)
1130 contr->ranges[range_skill] = this;
1131 1140
1132 break; 1141 break;
1133 1142
1134 case SKILL_TOOL: 1143 case SKILL_TOOL:
1135 if (chosen_skill) 1144 if (chosen_skill)
1136 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1145 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1137 1146
1138 chosen_skill = tmp; 1147 chosen_skill = tmp;
1139
1140 if (type == PLAYER)
1141 contr->ranges[range_skill] = this;
1142 break; 1148 break;
1143 1149
1144 case SHIELD: 1150 case SHIELD:
1145 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1151 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1146 contr->encumbrance += (int) tmp->weight / 2000; 1152 contr->encumbrance += (int) tmp->weight / 2000;
… …
1150 case HELMET: 1156 case HELMET:
1151 case BOOTS: 1157 case BOOTS:
1152 case GLOVES: 1158 case GLOVES:
1153 case CLOAK: 1159 case CLOAK:
1154 if (tmp->stats.wc) 1160 if (tmp->stats.wc)
1155 wc -= (tmp->stats.wc + tmp->magic); 1161 wc -= tmp->stats.wc + tmp->magic;
1156 1162
1157 if (tmp->stats.dam) 1163 if (tmp->stats.dam)
1158 stats.dam += (tmp->stats.dam + tmp->magic); 1164 stats.dam += tmp->stats.dam + tmp->magic;
1159 1165
1160 if (tmp->stats.ac) 1166 if (tmp->stats.ac)
1161 ac -= (tmp->stats.ac + tmp->magic); 1167 ac -= tmp->stats.ac + tmp->magic;
1162 1168
1163 break; 1169 break;
1164 1170
1171 case BOW:
1165 case WEAPON: 1172 case WEAPON:
1173 if (type != PLAYER || current_weapon == tmp)
1174 {
1166 wc -= (tmp->stats.wc + tmp->magic); 1175 wc -= tmp->stats.wc + tmp->magic;
1167 1176
1168 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1177 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1169 ac -= tmp->stats.ac + tmp->magic; 1178 ac -= tmp->stats.ac + tmp->magic;
1170 1179
1171 stats.dam += (tmp->stats.dam + tmp->magic); 1180 stats.dam += tmp->stats.dam + tmp->magic;
1172 weapon_weight = tmp->weight; 1181 weapon_weight = tmp->weight;
1173 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1182 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1174 1183
1175 if (weapon_speed < 0) 1184 if (weapon_speed < 0)
1176 weapon_speed = 0; 1185 weapon_speed = 0;
1177 1186
1178 slaying = tmp->slaying; 1187 slaying = tmp->slaying;
1188
1179 /* If there is desire that two handed weapons should do 1189 /* If there is desire that two handed weapons should do
1180 * extra strength damage, this is where the code should 1190 * extra strength damage, this is where the code should
1181 * go. 1191 * go.
1182 */ 1192 */
1183 current_weapon = tmp; 1193
1184 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1194 if (type == PLAYER)
1195 if (settings.spell_encumbrance)
1185 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1196 contr->encumbrance += tmp->weight * 3 / 1000;
1197 }
1186 1198
1187 break; 1199 break;
1188 1200
1189 case ARMOUR: /* Only the best of these three are used: */ 1201 case ARMOUR: /* Only the best of these three are used: */
1190 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1202 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1191 contr->encumbrance += (int) tmp->weight / 1000; 1203 contr->encumbrance += tmp->weight / 1000;
1192 1204
1193 case BRACERS: 1205 case BRACERS:
1194 case FORCE: 1206 case FORCE:
1195 if (tmp->stats.wc) 1207 if (tmp->stats.wc)
1196 { 1208 {
… …
1218 wc -= (tmp->stats.wc + tmp->magic); 1230 wc -= (tmp->stats.wc + tmp->magic);
1219 1231
1220 if (tmp->stats.ac) 1232 if (tmp->stats.ac)
1221 ac -= (tmp->stats.ac + tmp->magic); 1233 ac -= (tmp->stats.ac + tmp->magic);
1222 1234
1223 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max) 1235 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max)
1224 max = ARMOUR_SPEED (tmp) / 10.0; 1236 max = ARMOUR_SPEED (tmp) / 10.f;
1225 1237
1226 break; 1238 break;
1227 } /* switch tmp->type */ 1239 } /* switch tmp->type */
1228 } /* item is equipped */ 1240 } /* item is equipped */
1229 } /* for loop of items */ 1241 } /* for loop of items */
… …
1297 1309
1298 if (mana_obj == this && type == PLAYER) 1310 if (mana_obj == this && type == PLAYER)
1299 stats.maxsp = 1; 1311 stats.maxsp = 1;
1300 else 1312 else
1301 { 1313 {
1302 sp_tmp = 0.0; 1314 sp_tmp = 0.f;
1303 1315
1304 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1316 for (i = 1; i <= mana_obj->level && i <= 10; i++)
1305 { 1317 {
1306 float stmp; 1318 float stmp;
1307 1319
1308 /* Got some extra bonus at first level */ 1320 /* Got some extra bonus at first level */
1309 if (i < 2) 1321 if (i < 2)
1310 stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0); 1322 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1311 else 1323 else
1312 stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0; 1324 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1313 1325
1314 if (stmp < 1.0) 1326 if (stmp < 1.f)
1315 stmp = 1.0; 1327 stmp = 1.f;
1316 1328
1317 sp_tmp += stmp; 1329 sp_tmp += stmp;
1318 } 1330 }
1319 1331
1320 stats.maxsp = (int) sp_tmp; 1332 stats.maxsp = (sint16)sp_tmp;
1321 1333
1322 for (i = 11; i <= mana_obj->level; i++) 1334 for (i = 11; i <= mana_obj->level; i++)
1323 stats.maxsp += 2; 1335 stats.maxsp += 2;
1324 } 1336 }
1325 /* Characters can get their sp supercharged via rune of transferrance */ 1337 /* Characters can get their sp supercharged via rune of transferrance */
… …
1337 /* store grace in a float - this way, the divisions below don't create 1349 /* store grace in a float - this way, the divisions below don't create
1338 * big jumps when you go from level to level - with int's, it then 1350 * big jumps when you go from level to level - with int's, it then
1339 * becomes big jumps when the sums of the bonuses jump to the next 1351 * becomes big jumps when the sums of the bonuses jump to the next
1340 * step of 8 - with floats, even fractional ones are useful. 1352 * step of 8 - with floats, even fractional ones are useful.
1341 */ 1353 */
1342 sp_tmp = 0.0; 1354 sp_tmp = 0.f;
1343 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1355 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)
1344 { 1356 {
1345 float grace_tmp = 0.0; 1357 float grace_tmp = 0.f;
1346 1358
1347 /* Got some extra bonus at first level */ 1359 /* Got some extra bonus at first level */
1348 if (i < 2) 1360 if (i < 2)
1349 grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] + 1361 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1350 2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1351 else 1362 else
1352 grace_tmp = (float) contr->levgrace[i]
1353 + ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0; 1363 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1354 1364
1355 if (grace_tmp < 1.0) 1365 if (grace_tmp < 1.f)
1356 grace_tmp = 1.0; 1366 grace_tmp = 1.f;
1357 1367
1358 sp_tmp += grace_tmp; 1368 sp_tmp += grace_tmp;
1359 } 1369 }
1360 1370
1361 stats.maxgrace = (int) sp_tmp; 1371 stats.maxgrace = (sint16)sp_tmp;
1362 1372
1363 /* two grace points per level after 11 */ 1373 /* two grace points per level after 11 */
1364 for (i = 11; i <= grace_obj->level; i++) 1374 for (i = 11; i <= grace_obj->level; i++)
1365 stats.maxgrace += 2; 1375 stats.maxgrace += 2;
1366 } 1376 }
… …
1386 * monster bonus the same as before. -b.t. 1396 * monster bonus the same as before. -b.t.
1387 */ 1397 */
1388 1398
1389 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1399 if (type == PLAYER && wc_obj && wc_obj->level > 1)
1390 { 1400 {
1391 wc -= (wc_obj->level + thaco_bonus[stats.Str]); 1401 wc -= wc_obj->level + thaco_bonus[stats.Str];
1402
1392 for (i = 1; i < wc_obj->level; i++) 1403 for (i = 1; i < wc_obj->level; i++)
1393 { 1404 {
1394 /* addtional wc every 6 levels */ 1405 /* addtional wc every 6 levels */
1395 if (!(i % 6)) 1406 if (!(i % 6))
1396 wc--; 1407 wc--;
1408
1397 /* addtional dam every 4 levels. */ 1409 /* addtional dam every 4 levels. */
1398 if (!(i % 4) && (dam_bonus[stats.Str] >= 0)) 1410 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1399 stats.dam += (1 + (dam_bonus[stats.Str] / 5)); 1411 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1400 } 1412 }
1401 } 1413 }
1402 else 1414 else
1403 wc -= (level + thaco_bonus[stats.Str]); 1415 wc -= level + thaco_bonus[stats.Str];
1404 1416
1405 stats.dam += dam_bonus[stats.Str]; 1417 stats.dam += dam_bonus[stats.Str];
1406 1418
1407 if (stats.dam < 1) 1419 if (stats.dam < 1)
1408 stats.dam = 1; 1420 stats.dam = 1;
1409 1421
1410 speed = 1.0 + speed_bonus[stats.Dex]; 1422 speed = 1.f + speed_bonus[stats.Dex];
1411 1423
1412 if (settings.search_items && contr->search_str[0]) 1424 if (settings.search_items && contr->search_str[0])
1413 speed -= 1; 1425 speed -= 1;
1414 1426
1415 if (attacktype == 0) 1427 if (attacktype == 0)
1416 attacktype = arch->clone.attacktype; 1428 attacktype = arch->clone.attacktype;
1417 1429
1418 } /* End if player */ 1430 } /* End if player */
1419 1431
1420 if (added_speed >= 0) 1432 if (added_speed >= 0)
1421 speed += added_speed / 10.0; 1433 speed += added_speed / 10.f;
1422 else /* Something wrong here...: */ 1434 else /* Something wrong here...: */
1423 speed /= (float) (1.0 - added_speed); 1435 speed /= 1.f - added_speed;
1424 1436
1425 /* Max is determined by armour */ 1437 /* Max is determined by armour */
1426 if (speed > max) 1438 if (speed > max)
1427 speed = max; 1439 speed = max;
1428 1440
… …
1433 * weight limit, then player suffers a speed reduction based on how 1445 * weight limit, then player suffers a speed reduction based on how
1434 * much above he is, and what is max carry is 1446 * much above he is, and what is max carry is
1435 */ 1447 */
1436 f = (carrying / 1000) - max_carry[stats.Str]; 1448 f = (carrying / 1000) - max_carry[stats.Str];
1437 if (f > 0) 1449 if (f > 0)
1438 speed = speed / (1.0 + f / max_carry[stats.Str]); 1450 speed = speed / (1.f + f / max_carry[stats.Str]);
1439 } 1451 }
1440 1452
1441 speed += bonus_speed / 10.0; /* Not affected by limits */ 1453 speed += bonus_speed / 10.f; /* Not affected by limits */
1442 1454
1443 /* Put a lower limit on speed. Note with this speed, you move once every 1455 /* Put a lower limit on speed. Note with this speed, you move once every
1444 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1456 * 100 ticks or so. This amounts to once every 12 seconds of realtime.
1445 */ 1457 */
1446 speed = speed * speed_reduce_from_disease; 1458 speed = speed * speed_reduce_from_disease;
1447 1459
1448 if (speed < 0.01 && type == PLAYER) 1460 if (speed < 0.01f && type == PLAYER)
1449 speed = 0.01; 1461 speed = 0.01f;
1450 1462
1451 if (type == PLAYER) 1463 if (type == PLAYER)
1452 { 1464 {
1453 float M, W, s, D, K, S, M2;
1454
1455 /* (This formula was made by vidarl@ifi.uio.no) 1465 /* (This formula was made by vidarl@ifi.uio.no)
1456 * Note that we never used these values again - basically 1466 * Note that we never used these values again - basically
1457 * all of these could be subbed into one big equation, but 1467 * all of these could be subbed into one big equation, but
1458 * that would just be a real pain to read. 1468 * that would just be a real pain to read.
1459 */ 1469 */
1460 M = (max_carry[stats.Str] - 121) / 121.0; 1470 float M = (max_carry[stats.Str] - 121) / 121.f;
1461 M2 = max_carry[stats.Str] / 100.0; 1471 float M2 = max_carry[stats.Str] / 100.f;
1462 W = weapon_weight / 20000.0; 1472 float W = weapon_weight / 20000.f;
1463 s = 2 - weapon_speed / 10.0; 1473 float s = 2 - weapon_speed / 10.f;
1464 D = (stats.Dex - 14) / 14.0; 1474 float D = (stats.Dex - 14) / 14.f;
1465 K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0; 1475 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1476
1466 K *= (4 + level) / (float) (6 + level) * 1.2; 1477 K *= (4 + level) *1.2f / (6 + level);
1478
1467 if (K <= 0) 1479 if (K <= 0.f)
1468 K = 0.01; 1480 K = 0.01f;
1481
1469 S = speed / (K * s); 1482 float S = speed / (K * s);
1483
1470 contr->weapon_sp = S; 1484 contr->weapon_sp = S;
1471 } 1485 }
1472 1486
1473 /* I want to limit the power of small monsters with big weapons: */ 1487 /* I want to limit the power of small monsters with big weapons: */
1474 if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3) 1488 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)
1475 stats.dam = arch->clone.stats.dam * 3; 1489 stats.dam = arch->clone.stats.dam * 3;
1476 1490
1477 /* Prevent overflows of wc - best you can get is ABS(120) - this 1491 /* Prevent overflows of wc - best you can get is ABS(120) - this
1478 * should be more than enough - remember, AC is also in 8 bits, 1492 * should be more than enough - remember, AC is also in 8 bits,
1479 * so its value is the same. 1493 * so its value is the same.
… …
1528 * false otherwise. 1542 * false otherwise.
1529 */ 1543 */
1530int 1544int
1531allowed_class (const object *op) 1545allowed_class (const object *op)
1532{ 1546{
1533 return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 && 1547 return op->stats.Dex > 0
1534 op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0; 1548 && op->stats.Str > 0
1549 && op->stats.Con > 0
1550 && op->stats.Int > 0
1551 && op->stats.Wis > 0
1552 && op->stats.Pow > 0
1553 && op->stats.Cha > 0;
1535} 1554}
1536 1555
1537/* 1556/*
1538 * set the new dragon name after gaining levels or 1557 * set the new dragon name after gaining levels or
1539 * changing ability focus (later this can be extended to 1558 * changing ability focus (later this can be extended to
… …
1761sint64 1780sint64
1762level_exp (int level, double expmul) 1781level_exp (int level, double expmul)
1763{ 1782{
1764 if (level > settings.max_level) 1783 if (level > settings.max_level)
1765 return (sint64) (expmul * levels[settings.max_level]); 1784 return (sint64) (expmul * levels[settings.max_level]);
1785
1766 return (sint64) (expmul * levels[level]); 1786 return (sint64) (expmul * levels[level]);
1767} 1787}
1768 1788
1769/* 1789/*
1770 * Ensure that the permanent experience requirements in an exp object are met. 1790 * Ensure that the permanent experience requirements in an exp object are met.
… …
1807 sint64 limit, exp_to_add; 1827 sint64 limit, exp_to_add;
1808 int i; 1828 int i;
1809 1829
1810 /* prevents some forms of abuse. */ 1830 /* prevents some forms of abuse. */
1811 if (op->contr->braced) 1831 if (op->contr->braced)
1812 exp = exp / 5; 1832 exp /= 5;
1813 1833
1814 /* Try to find the matching skill. 1834 /* Try to find the matching skill.
1815 * We do a shortcut/time saving mechanism first - see if it matches 1835 * We do a shortcut/time saving mechanism first - see if it matches
1816 * chosen_skill. This means we don't need to search through 1836 * chosen_skill. This means we don't need to search through
1817 * the players inventory. 1837 * the players inventory.
1818 */ 1838 */
1819 if (skill_name) 1839 if (skill_name)
1820 { 1840 {
1821 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1841 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))
… …
1973 * these last two values are only used for players. 1993 * these last two values are only used for players.
1974 */ 1994 */
1975void 1995void
1976change_exp (object *op, sint64 exp, const char *skill_name, int flag) 1996change_exp (object *op, sint64 exp, const char *skill_name, int flag)
1977{ 1997{
1978
1979#ifdef EXP_DEBUG 1998#ifdef EXP_DEBUG
1980 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp); 1999 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1981#endif 2000#endif
1982 2001
1983 /* safety */ 2002 /* safety */
… …
2032 2051
2033/* Applies a death penalty experience, the size of this is defined by the 2052/* 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 2053 * settings death_penalty_percentage and death_penalty_levels, and by the
2035 * amount of permenent experience, whichever gives the lowest loss. 2054 * amount of permenent experience, whichever gives the lowest loss.
2036 */ 2055 */
2037
2038void 2056void
2039apply_death_exp_penalty (object *op) 2057apply_death_exp_penalty (object *op)
2040{ 2058{
2041 object *tmp; 2059 object *tmp;
2042 sint64 loss; 2060 sint64 loss;

Diff Legend

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