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.39 by root, Sun Apr 29 14:39:55 2007 UTC vs.
Revision 1.47 by root, Mon May 7 03:05:57 2007 UTC

… …
850 contr->gen_hp = 0; 850 contr->gen_hp = 0;
851 contr->gen_sp = 0; 851 contr->gen_sp = 0;
852 contr->gen_grace = 0; 852 contr->gen_grace = 0;
853 contr->gen_sp_armour = 10; 853 contr->gen_sp_armour = 10;
854 contr->item_power = 0; 854 contr->item_power = 0;
855
856 /* Don't clobber all the range_ values. range_golem otherwise
857 * gets reset for no good reason, and we don't want to reset
858 * range_magic (what spell is readied). These three below
859 * well get filled in based on what the player has equipped.
860 */
861 contr->ranges[range_bow] = 0;
862 contr->ranges[range_misc] = 0;
863 contr->ranges[range_skill] = 0;
864 } 855 }
865 856
866 memcpy (body_used, body_info, sizeof (body_info)); 857 for (int i = NUM_BODY_LOCATIONS; i--; )
858 slot[i].used = slot[i].info;
867 859
868 slaying = 0; 860 slaying = 0;
869 861
870 if (!QUERY_FLAG (this, FLAG_WIZ)) 862 if (!QUERY_FLAG (this, FLAG_WIZ))
871 { 863 {
… …
886 path_repelled = arch->clone.path_repelled; 878 path_repelled = arch->clone.path_repelled;
887 path_denied = arch->clone.path_denied; 879 path_denied = arch->clone.path_denied;
888 glow_radius = arch->clone.glow_radius; 880 glow_radius = arch->clone.glow_radius;
889 move_type = arch->clone.move_type; 881 move_type = arch->clone.move_type;
890 882
891 chosen_skill = NULL; 883 chosen_skill = 0;
892 884
893 /* initializing resistances from the values in player/monster's 885 /* initializing resistances from the values in player/monster's
894 * archetype clone 886 * archetype clone
895 */ 887 */
896 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 888 memcpy (&resist, &arch->clone.resist, sizeof (resist));
… …
899 { 891 {
900 if (resist[i] > 0) 892 if (resist[i] > 0)
901 prot[i] = resist[i], vuln[i] = 0; 893 prot[i] = resist[i], vuln[i] = 0;
902 else 894 else
903 vuln[i] = -(resist[i]), prot[i] = 0; 895 vuln[i] = -(resist[i]), prot[i] = 0;
896
904 potion_resist[i] = 0; 897 potion_resist[i] = 0;
905 } 898 }
906 899
907 wc = arch->clone.stats.wc; 900 wc = arch->clone.stats.wc;
908 stats.dam = arch->clone.stats.dam; 901 stats.dam = arch->clone.stats.dam;
… …
935 */ 928 */
936 if (tmp->glow_radius > glow_radius) 929 if (tmp->glow_radius > glow_radius)
937 glow_radius = tmp->glow_radius; 930 glow_radius = tmp->glow_radius;
938 931
939 /* This happens because apply_potion calls change_abil with the potion 932 /* This happens because apply_potion calls change_abil with the potion
940 * applied so we can tell the player what chagned. But change_abil 933 * applied so we can tell the player what changed. But change_abil
941 * then calls this function. 934 * then calls this function.
942 */ 935 */
943 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 936 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
944 continue; 937 continue;
945 938
… …
979 || (tmp->type == SKILL 972 || (tmp->type == SKILL
980 && tmp->subtype == SK_PRAYING)) 973 && tmp->subtype == SK_PRAYING))
981 { 974 {
982 if (type == PLAYER) 975 if (type == PLAYER)
983 { 976 {
984 if (tmp->type == BOW)
985 contr->ranges[range_bow] = tmp;
986
987 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 977 if ((tmp->type == WEAPON || tmp->type == BOW)
988 contr->ranges[range_misc] = tmp; 978 && tmp != current_weapon)
979 continue;
989 980
990 for (i = 0; i < NUM_STATS; i++) 981 for (i = 0; i < NUM_STATS; i++)
991 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i)); 982 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i));
992 983
993 /* these are the items that currently can change digestion, regeneration, 984 /* these are the items that currently can change digestion, regeneration,
… …
1009 contr->gen_grace += tmp->stats.grace; 1000 contr->gen_grace += tmp->stats.grace;
1010 contr->gen_sp_armour += tmp->gen_sp_armour; 1001 contr->gen_sp_armour += tmp->gen_sp_armour;
1011 contr->item_power += tmp->item_power; 1002 contr->item_power += tmp->item_power;
1012 } 1003 }
1013 } /* if this is a player */ 1004 } /* if this is a player */
1005 else
1006 {
1007 if (tmp->type == WEAPON)
1008 current_weapon = tmp;
1009 }
1014 1010
1015 /* Update slots used for items */ 1011 /* Update slots used for items */
1016 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 1012 if (QUERY_FLAG (tmp, FLAG_APPLIED))
1017 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1013 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1018 body_used[i] += tmp->body_info[i]; 1014 slot[i].used += tmp->slot[i].info;
1019 1015
1020 if (tmp->type == SYMPTOM) 1016 if (tmp->type == SYMPTOM)
1021 { 1017 {
1022 speed_reduce_from_disease = tmp->last_sp / 100.0; 1018 speed_reduce_from_disease = tmp->last_sp / 100.f;
1023 1019
1024 if (speed_reduce_from_disease == 0) 1020 if (speed_reduce_from_disease == 0)
1025 speed_reduce_from_disease = 1; 1021 speed_reduce_from_disease = 1;
1026 } 1022 }
1027 1023
… …
1050 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 1046 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1051 } 1047 }
1052 } 1048 }
1053 1049
1054 /* There may be other things that should not adjust the attacktype */ 1050 /* There may be other things that should not adjust the attacktype */
1055 if (tmp->type != BOW && tmp->type != SYMPTOM) 1051 if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM)
1052 || current_weapon == tmp)
1053 {
1056 attacktype |= tmp->attacktype; 1054 attacktype |= tmp->attacktype;
1057
1058 path_attuned |= tmp->path_attuned; 1055 path_attuned |= tmp->path_attuned;
1059 path_repelled |= tmp->path_repelled; 1056 path_repelled |= tmp->path_repelled;
1060 path_denied |= tmp->path_denied; 1057 path_denied |= tmp->path_denied;
1061 move_type |= tmp->move_type; 1058 move_type |= tmp->move_type;
1062 stats.luck += tmp->stats.luck; 1059 stats.luck += tmp->stats.luck;
1060 }
1063 1061
1064 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 1062 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1065 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL); 1063 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1066 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE); 1064 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1067 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH); 1065 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
… …
1080 1078
1081 if (tmp->stats.exp && tmp->type != SKILL) 1079 if (tmp->stats.exp && tmp->type != SKILL)
1082 { 1080 {
1083 if (tmp->stats.exp > 0) 1081 if (tmp->stats.exp > 0)
1084 { 1082 {
1085 added_speed += (float) tmp->stats.exp / 3.0; 1083 added_speed += tmp->stats.exp / 3.f;
1086 bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0; 1084 bonus_speed += tmp->stats.exp / 3.f + 1.f;
1087 } 1085 }
1088 else 1086 else
1089 added_speed += (float) tmp->stats.exp; 1087 added_speed += tmp->stats.exp;
1090 } 1088 }
1091 1089
1092 switch (tmp->type) 1090 switch (tmp->type)
1093 { 1091 {
1092#if 0
1093 case WAND:
1094 case ROD:
1095 case HORN:
1096 if (type != PLAYER || current_weapon == tmp)
1097 chosen_skill = tmp;
1098 break;
1099#endif
1100
1094 /* skills modifying the character -b.t. */ 1101 /* skills modifying the character -b.t. */
1095 /* for all skills and skill granting objects */ 1102 /* for all skills and skill granting objects */
1096 case SKILL: 1103 case SKILL:
1097 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1104 if (!QUERY_FLAG (tmp, FLAG_APPLIED))
1098 break; 1105 break;
… …
1106 chosen_skill = tmp; 1113 chosen_skill = tmp;
1107 1114
1108 if (tmp->stats.dam > 0) 1115 if (tmp->stats.dam > 0)
1109 { /* skill is a 'weapon' */ 1116 { /* skill is a 'weapon' */
1110 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1117 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1111 weapon_speed = (int) WEAPON_SPEED (tmp); 1118 weapon_speed = WEAPON_SPEED (tmp);
1112 1119
1113 if (weapon_speed < 0) 1120 if (weapon_speed < 0)
1114 weapon_speed = 0; 1121 weapon_speed = 0;
1115 1122
1116 weapon_weight = tmp->weight; 1123 weapon_weight = tmp->weight;
… …
1119 if (tmp->magic) 1126 if (tmp->magic)
1120 stats.dam += tmp->magic; 1127 stats.dam += tmp->magic;
1121 } 1128 }
1122 1129
1123 if (tmp->stats.wc) 1130 if (tmp->stats.wc)
1124 wc -= (tmp->stats.wc + tmp->magic); 1131 wc -= tmp->stats.wc + tmp->magic;
1125 1132
1126 if (tmp->slaying != NULL) 1133 if (tmp->slaying)
1127 slaying = tmp->slaying; 1134 slaying = tmp->slaying;
1128 1135
1129 if (tmp->stats.ac) 1136 if (tmp->stats.ac)
1130 ac -= (tmp->stats.ac + tmp->magic); 1137 ac -= tmp->stats.ac + tmp->magic;
1131 1138
1132 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1139 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1133 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1140 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1134
1135 if (type == PLAYER)
1136 contr->ranges[range_skill] = this;
1137 1141
1138 break; 1142 break;
1139 1143
1140 case SKILL_TOOL: 1144 case SKILL_TOOL:
1141 if (chosen_skill) 1145 if (chosen_skill)
1142 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1146 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1143 1147
1144 chosen_skill = tmp; 1148 chosen_skill = tmp;
1145
1146 if (type == PLAYER)
1147 contr->ranges[range_skill] = this;
1148 break; 1149 break;
1149 1150
1150 case SHIELD: 1151 case SHIELD:
1151 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1152 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1152 contr->encumbrance += (int) tmp->weight / 2000; 1153 contr->encumbrance += (int) tmp->weight / 2000;
… …
1168 1169
1169 break; 1170 break;
1170 1171
1171 case BOW: 1172 case BOW:
1172 case WEAPON: 1173 case WEAPON:
1174 if (type != PLAYER || current_weapon == tmp)
1175 {
1173 wc -= tmp->stats.wc + tmp->magic; 1176 wc -= tmp->stats.wc + tmp->magic;
1174 1177
1175 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1178 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1176 ac -= tmp->stats.ac + tmp->magic; 1179 ac -= tmp->stats.ac + tmp->magic;
1177 1180
1178 stats.dam += tmp->stats.dam + tmp->magic; 1181 stats.dam += tmp->stats.dam + tmp->magic;
1179 weapon_weight = tmp->weight; 1182 weapon_weight = tmp->weight;
1180 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1183 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1181 1184
1182 if (weapon_speed < 0) 1185 if (weapon_speed < 0)
1183 weapon_speed = 0; 1186 weapon_speed = 0;
1184 1187
1185 slaying = tmp->slaying; 1188 slaying = tmp->slaying;
1189
1186 /* If there is desire that two handed weapons should do 1190 /* If there is desire that two handed weapons should do
1187 * extra strength damage, this is where the code should 1191 * extra strength damage, this is where the code should
1188 * go. 1192 * go.
1189 */ 1193 */
1190 current_weapon = tmp; 1194
1191 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1195 if (type == PLAYER)
1196 if (settings.spell_encumbrance)
1192 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1197 contr->encumbrance += tmp->weight * 3 / 1000;
1198 }
1193 1199
1194 break; 1200 break;
1195 1201
1196 case ARMOUR: /* Only the best of these three are used: */ 1202 case ARMOUR: /* Only the best of these three are used: */
1197 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1203 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1198 contr->encumbrance += (int) tmp->weight / 1000; 1204 contr->encumbrance += tmp->weight / 1000;
1199 1205
1200 case BRACERS: 1206 case BRACERS:
1201 case FORCE: 1207 case FORCE:
1202 if (tmp->stats.wc) 1208 if (tmp->stats.wc)
1203 { 1209 {
… …
1225 wc -= (tmp->stats.wc + tmp->magic); 1231 wc -= (tmp->stats.wc + tmp->magic);
1226 1232
1227 if (tmp->stats.ac) 1233 if (tmp->stats.ac)
1228 ac -= (tmp->stats.ac + tmp->magic); 1234 ac -= (tmp->stats.ac + tmp->magic);
1229 1235
1230 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max) 1236 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max)
1231 max = ARMOUR_SPEED (tmp) / 10.0; 1237 max = ARMOUR_SPEED (tmp) / 10.f;
1232 1238
1233 break; 1239 break;
1234 } /* switch tmp->type */ 1240 } /* switch tmp->type */
1235 } /* item is equipped */ 1241 } /* item is equipped */
1236 } /* for loop of items */ 1242 } /* for loop of items */
… …
1304 1310
1305 if (mana_obj == this && type == PLAYER) 1311 if (mana_obj == this && type == PLAYER)
1306 stats.maxsp = 1; 1312 stats.maxsp = 1;
1307 else 1313 else
1308 { 1314 {
1309 sp_tmp = 0.0; 1315 sp_tmp = 0.f;
1310 1316
1311 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1317 for (i = 1; i <= mana_obj->level && i <= 10; i++)
1312 { 1318 {
1313 float stmp; 1319 float stmp;
1314 1320
1315 /* Got some extra bonus at first level */ 1321 /* Got some extra bonus at first level */
1316 if (i < 2) 1322 if (i < 2)
1317 stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0); 1323 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1318 else 1324 else
1319 stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0; 1325 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1320 1326
1321 if (stmp < 1.0) 1327 if (stmp < 1.f)
1322 stmp = 1.0; 1328 stmp = 1.f;
1323 1329
1324 sp_tmp += stmp; 1330 sp_tmp += stmp;
1325 } 1331 }
1326 1332
1327 stats.maxsp = (int) sp_tmp; 1333 stats.maxsp = (sint16)sp_tmp;
1328 1334
1329 for (i = 11; i <= mana_obj->level; i++) 1335 for (i = 11; i <= mana_obj->level; i++)
1330 stats.maxsp += 2; 1336 stats.maxsp += 2;
1331 } 1337 }
1332 /* Characters can get their sp supercharged via rune of transferrance */ 1338 /* Characters can get their sp supercharged via rune of transferrance */
… …
1344 /* store grace in a float - this way, the divisions below don't create 1350 /* store grace in a float - this way, the divisions below don't create
1345 * big jumps when you go from level to level - with int's, it then 1351 * big jumps when you go from level to level - with int's, it then
1346 * becomes big jumps when the sums of the bonuses jump to the next 1352 * becomes big jumps when the sums of the bonuses jump to the next
1347 * step of 8 - with floats, even fractional ones are useful. 1353 * step of 8 - with floats, even fractional ones are useful.
1348 */ 1354 */
1349 sp_tmp = 0.0; 1355 sp_tmp = 0.f;
1350 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1356 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)
1351 { 1357 {
1352 float grace_tmp = 0.0; 1358 float grace_tmp = 0.f;
1353 1359
1354 /* Got some extra bonus at first level */ 1360 /* Got some extra bonus at first level */
1355 if (i < 2) 1361 if (i < 2)
1356 grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] + 1362 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1357 2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1358 else 1363 else
1359 grace_tmp = (float) contr->levgrace[i]
1360 + ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0; 1364 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1361 1365
1362 if (grace_tmp < 1.0) 1366 if (grace_tmp < 1.f)
1363 grace_tmp = 1.0; 1367 grace_tmp = 1.f;
1364 1368
1365 sp_tmp += grace_tmp; 1369 sp_tmp += grace_tmp;
1366 } 1370 }
1367 1371
1368 stats.maxgrace = (int) sp_tmp; 1372 stats.maxgrace = (sint16)sp_tmp;
1369 1373
1370 /* two grace points per level after 11 */ 1374 /* two grace points per level after 11 */
1371 for (i = 11; i <= grace_obj->level; i++) 1375 for (i = 11; i <= grace_obj->level; i++)
1372 stats.maxgrace += 2; 1376 stats.maxgrace += 2;
1373 } 1377 }
… …
1414 stats.dam += dam_bonus[stats.Str]; 1418 stats.dam += dam_bonus[stats.Str];
1415 1419
1416 if (stats.dam < 1) 1420 if (stats.dam < 1)
1417 stats.dam = 1; 1421 stats.dam = 1;
1418 1422
1419 speed = 1.0 + speed_bonus[stats.Dex]; 1423 speed = 1.f + speed_bonus[stats.Dex];
1420 1424
1421 if (settings.search_items && contr->search_str[0]) 1425 if (settings.search_items && contr->search_str[0])
1422 speed -= 1; 1426 speed -= 1;
1423 1427
1424 if (attacktype == 0) 1428 if (attacktype == 0)
1425 attacktype = arch->clone.attacktype; 1429 attacktype = arch->clone.attacktype;
1426 1430
1427 } /* End if player */ 1431 } /* End if player */
1428 1432
1429 if (added_speed >= 0) 1433 if (added_speed >= 0)
1430 speed += added_speed / 10.0; 1434 speed += added_speed / 10.f;
1431 else /* Something wrong here...: */ 1435 else /* Something wrong here...: */
1432 speed /= (float) (1.0 - added_speed); 1436 speed /= 1.f - added_speed;
1433 1437
1434 /* Max is determined by armour */ 1438 /* Max is determined by armour */
1435 if (speed > max) 1439 if (speed > max)
1436 speed = max; 1440 speed = max;
1437 1441
… …
1442 * weight limit, then player suffers a speed reduction based on how 1446 * weight limit, then player suffers a speed reduction based on how
1443 * much above he is, and what is max carry is 1447 * much above he is, and what is max carry is
1444 */ 1448 */
1445 f = (carrying / 1000) - max_carry[stats.Str]; 1449 f = (carrying / 1000) - max_carry[stats.Str];
1446 if (f > 0) 1450 if (f > 0)
1447 speed = speed / (1.0 + f / max_carry[stats.Str]); 1451 speed = speed / (1.f + f / max_carry[stats.Str]);
1448 } 1452 }
1449 1453
1450 speed += bonus_speed / 10.0; /* Not affected by limits */ 1454 speed += bonus_speed / 10.f; /* Not affected by limits */
1451 1455
1452 /* Put a lower limit on speed. Note with this speed, you move once every 1456 /* Put a lower limit on speed. Note with this speed, you move once every
1453 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1457 * 100 ticks or so. This amounts to once every 12 seconds of realtime.
1454 */ 1458 */
1455 speed = speed * speed_reduce_from_disease; 1459 speed = speed * speed_reduce_from_disease;
1456 1460
1457 if (speed < 0.01 && type == PLAYER) 1461 if (speed < 0.01f && type == PLAYER)
1458 speed = 0.01; 1462 speed = 0.01f;
1459 1463
1460 if (type == PLAYER) 1464 if (type == PLAYER)
1461 { 1465 {
1462 float M, W, s, D, K, S, M2;
1463
1464 /* (This formula was made by vidarl@ifi.uio.no) 1466 /* (This formula was made by vidarl@ifi.uio.no)
1465 * Note that we never used these values again - basically 1467 * Note that we never used these values again - basically
1466 * all of these could be subbed into one big equation, but 1468 * all of these could be subbed into one big equation, but
1467 * that would just be a real pain to read. 1469 * that would just be a real pain to read.
1468 */ 1470 */
1469 M = (max_carry[stats.Str] - 121) / 121.0; 1471 float M = (max_carry[stats.Str] - 121) / 121.f;
1470 M2 = max_carry[stats.Str] / 100.0; 1472 float M2 = max_carry[stats.Str] / 100.f;
1471 W = weapon_weight / 20000.0; 1473 float W = weapon_weight / 20000.f;
1472 s = 2 - weapon_speed / 10.0; 1474 float s = 2 - weapon_speed / 10.f;
1473 D = (stats.Dex - 14) / 14.0; 1475 float D = (stats.Dex - 14) / 14.f;
1474 K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0; 1476 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1477
1475 K *= (4 + level) / (float) (6 + level) * 1.2; 1478 K *= (4 + level) *1.2f / (6 + level);
1479
1476 if (K <= 0) 1480 if (K <= 0.f)
1477 K = 0.01; 1481 K = 0.01f;
1482
1478 S = speed / (K * s); 1483 float S = speed / (K * s);
1484
1479 contr->weapon_sp = S; 1485 contr->weapon_sp = S;
1480 } 1486 }
1481 1487
1482 /* I want to limit the power of small monsters with big weapons: */ 1488 /* I want to limit the power of small monsters with big weapons: */
1483 if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3) 1489 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)
1484 stats.dam = arch->clone.stats.dam * 3; 1490 stats.dam = arch->clone.stats.dam * 3;
1485 1491
1486 /* Prevent overflows of wc - best you can get is ABS(120) - this 1492 /* Prevent overflows of wc - best you can get is ABS(120) - this
1487 * should be more than enough - remember, AC is also in 8 bits, 1493 * should be more than enough - remember, AC is also in 8 bits,
1488 * so its value is the same. 1494 * so its value is the same.
… …
1537 * false otherwise. 1543 * false otherwise.
1538 */ 1544 */
1539int 1545int
1540allowed_class (const object *op) 1546allowed_class (const object *op)
1541{ 1547{
1542 return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 && 1548 return op->stats.Dex > 0
1543 op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0; 1549 && op->stats.Str > 0
1550 && op->stats.Con > 0
1551 && op->stats.Int > 0
1552 && op->stats.Wis > 0
1553 && op->stats.Pow > 0
1554 && op->stats.Cha > 0;
1544} 1555}
1545 1556
1546/* 1557/*
1547 * set the new dragon name after gaining levels or 1558 * set the new dragon name after gaining levels or
1548 * changing ability focus (later this can be extended to 1559 * changing ability focus (later this can be extended to
… …
1770sint64 1781sint64
1771level_exp (int level, double expmul) 1782level_exp (int level, double expmul)
1772{ 1783{
1773 if (level > settings.max_level) 1784 if (level > settings.max_level)
1774 return (sint64) (expmul * levels[settings.max_level]); 1785 return (sint64) (expmul * levels[settings.max_level]);
1786
1775 return (sint64) (expmul * levels[level]); 1787 return (sint64) (expmul * levels[level]);
1776} 1788}
1777 1789
1778/* 1790/*
1779 * Ensure that the permanent experience requirements in an exp object are met. 1791 * Ensure that the permanent experience requirements in an exp object are met.
… …
1816 sint64 limit, exp_to_add; 1828 sint64 limit, exp_to_add;
1817 int i; 1829 int i;
1818 1830
1819 /* prevents some forms of abuse. */ 1831 /* prevents some forms of abuse. */
1820 if (op->contr->braced) 1832 if (op->contr->braced)
1821 exp = exp / 5; 1833 exp /= 5;
1822 1834
1823 /* Try to find the matching skill. 1835 /* Try to find the matching skill.
1824 * We do a shortcut/time saving mechanism first - see if it matches 1836 * We do a shortcut/time saving mechanism first - see if it matches
1825 * chosen_skill. This means we don't need to search through 1837 * chosen_skill. This means we don't need to search through
1826 * the players inventory. 1838 * the players inventory.
1827 */ 1839 */
1828 if (skill_name) 1840 if (skill_name)
1829 { 1841 {
1830 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1842 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))

Diff Legend

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