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.38 by root, Sun Apr 29 04:14:57 2007 UTC vs.
Revision 1.45 by root, Mon Apr 30 04:25:29 2007 UTC

… …
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 = NULL;
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 */
… …
933 */ 926 */
934 if (tmp->glow_radius > glow_radius) 927 if (tmp->glow_radius > glow_radius)
935 glow_radius = tmp->glow_radius; 928 glow_radius = tmp->glow_radius;
936 929
937 /* This happens because apply_potion calls change_abil with the potion 930 /* This happens because apply_potion calls change_abil with the potion
938 * 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
939 * then calls this function. 932 * then calls this function.
940 */ 933 */
941 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 934 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
942 continue; 935 continue;
943 936
… …
969 * in the praying skill, and the player should always get those. 962 * 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, 963 * 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 964 * because the skill shouldn't count against body positions being used
972 * up, etc. 965 * up, etc.
973 */ 966 */
974 if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) || 967 if ((QUERY_FLAG (tmp, FLAG_APPLIED)
968 && tmp->type != CONTAINER
969 && tmp->type != CLOSE_CON)
970 || (tmp->type == SKILL
975 (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) 971 && tmp->subtype == SK_PRAYING))
976 { 972 {
977 if (type == PLAYER) 973 if (type == PLAYER)
978 { 974 {
979 if (tmp->type == BOW)
980 contr->ranges[range_bow] = tmp;
981
982 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
983 contr->ranges[range_misc] = tmp;
984
985 for (i = 0; i < NUM_STATS; i++) 975 for (i = 0; i < NUM_STATS; i++)
986 change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i)); 976 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i));
987 977
988 /* these are the items that currently can change digestion, regeneration, 978 /* these are the items that currently can change digestion, regeneration,
989 * spell point recovery and mana point recovery. Seems sort of an arbitary 979 * spell point recovery and mana point recovery. Seems sort of an arbitary
990 * list, but other items store other info into stats array. 980 * list, but other items store other info into stats array.
991 */ 981 */
… …
1012 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1002 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1013 body_used[i] += tmp->body_info[i]; 1003 body_used[i] += tmp->body_info[i];
1014 1004
1015 if (tmp->type == SYMPTOM) 1005 if (tmp->type == SYMPTOM)
1016 { 1006 {
1017 speed_reduce_from_disease = tmp->last_sp / 100.0; 1007 speed_reduce_from_disease = tmp->last_sp / 100.f;
1008
1018 if (speed_reduce_from_disease == 0) 1009 if (speed_reduce_from_disease == 0)
1019 speed_reduce_from_disease = 1; 1010 speed_reduce_from_disease = 1;
1020 } 1011 }
1021 1012
1022 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 1013 /* Pos. and neg. protections are counted seperate (-> pro/vuln).
… …
1047 1038
1048 /* There may be other things that should not adjust the attacktype */ 1039 /* There may be other things that should not adjust the attacktype */
1049 if (tmp->type != BOW && tmp->type != SYMPTOM) 1040 if (tmp->type != BOW && tmp->type != SYMPTOM)
1050 attacktype |= tmp->attacktype; 1041 attacktype |= tmp->attacktype;
1051 1042
1052 path_attuned |= tmp->path_attuned; 1043 path_attuned |= tmp->path_attuned;
1053 path_repelled |= tmp->path_repelled; 1044 path_repelled |= tmp->path_repelled;
1054 path_denied |= tmp->path_denied; 1045 path_denied |= tmp->path_denied;
1046 move_type |= tmp->move_type;
1055 stats.luck += tmp->stats.luck; 1047 stats.luck += tmp->stats.luck;
1056 move_type |= tmp->move_type;
1057 1048
1058 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 1049 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); 1050 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); 1051 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); 1052 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
… …
1074 1065
1075 if (tmp->stats.exp && tmp->type != SKILL) 1066 if (tmp->stats.exp && tmp->type != SKILL)
1076 { 1067 {
1077 if (tmp->stats.exp > 0) 1068 if (tmp->stats.exp > 0)
1078 { 1069 {
1079 added_speed += (float) tmp->stats.exp / 3.0; 1070 added_speed += tmp->stats.exp / 3.f;
1080 bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0; 1071 bonus_speed += tmp->stats.exp / 3.f + 1.f;
1081 } 1072 }
1082 else 1073 else
1083 added_speed += (float) tmp->stats.exp; 1074 added_speed += tmp->stats.exp;
1084 } 1075 }
1085 1076
1086 switch (tmp->type) 1077 switch (tmp->type)
1087 { 1078 {
1079 case WAND:
1080 case ROD:
1081 case HORN:
1082 if (type == PLAYER)
1083 {
1084 contr->ranged_skill = this;
1085 contr->ranged_ob = tmp;
1086 }
1087 break;
1088
1088 /* skills modifying the character -b.t. */ 1089 /* skills modifying the character -b.t. */
1089 /* for all skills and skill granting objects */ 1090 /* for all skills and skill granting objects */
1090 case SKILL: 1091 case SKILL:
1091 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1092 if (!QUERY_FLAG (tmp, FLAG_APPLIED))
1092 break; 1093 break;
… …
1100 chosen_skill = tmp; 1101 chosen_skill = tmp;
1101 1102
1102 if (tmp->stats.dam > 0) 1103 if (tmp->stats.dam > 0)
1103 { /* skill is a 'weapon' */ 1104 { /* skill is a 'weapon' */
1104 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1105 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1105 weapon_speed = (int) WEAPON_SPEED (tmp); 1106 weapon_speed = WEAPON_SPEED (tmp);
1106 1107
1107 if (weapon_speed < 0) 1108 if (weapon_speed < 0)
1108 weapon_speed = 0; 1109 weapon_speed = 0;
1109 1110
1110 weapon_weight = tmp->weight; 1111 weapon_weight = tmp->weight;
… …
1113 if (tmp->magic) 1114 if (tmp->magic)
1114 stats.dam += tmp->magic; 1115 stats.dam += tmp->magic;
1115 } 1116 }
1116 1117
1117 if (tmp->stats.wc) 1118 if (tmp->stats.wc)
1118 wc -= (tmp->stats.wc + tmp->magic); 1119 wc -= tmp->stats.wc + tmp->magic;
1119 1120
1120 if (tmp->slaying != NULL) 1121 if (tmp->slaying)
1121 slaying = tmp->slaying; 1122 slaying = tmp->slaying;
1122 1123
1123 if (tmp->stats.ac) 1124 if (tmp->stats.ac)
1124 ac -= (tmp->stats.ac + tmp->magic); 1125 ac -= tmp->stats.ac + tmp->magic;
1125 1126
1126 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1127 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1127 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1128 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1128 1129
1129 if (type == PLAYER) 1130 if (type == PLAYER)
1131 {
1130 contr->ranges[range_skill] = this; 1132 contr->ranged_skill = this;
1133 contr->ranged_ob = tmp;
1134 }
1131 1135
1132 break; 1136 break;
1133 1137
1134 case SKILL_TOOL: 1138 case SKILL_TOOL:
1135 if (chosen_skill) 1139 if (chosen_skill)
1136 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1140 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1137 1141
1138 chosen_skill = tmp; 1142 chosen_skill = tmp;
1139 1143
1140 if (type == PLAYER) 1144 if (type == PLAYER)
1145 {
1141 contr->ranges[range_skill] = this; 1146 contr->ranged_skill = this;
1147 contr->ranged_ob = tmp;
1148 }
1142 break; 1149 break;
1143 1150
1144 case SHIELD: 1151 case SHIELD:
1145 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1152 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1146 contr->encumbrance += (int) tmp->weight / 2000; 1153 contr->encumbrance += (int) tmp->weight / 2000;
… …
1162 1169
1163 break; 1170 break;
1164 1171
1165 case BOW: 1172 case BOW:
1166 case WEAPON: 1173 case WEAPON:
1174 if (type != PLAYER
1175 || (contr->combat_skill && contr->combat_skill->type == SKILL && (skill_flags [contr->combat_skill->subtype] & SF_NEED_BOW ) && tmp->type == BOW )
1176 || (contr->combat_skill && contr->combat_skill->type == SKILL && (skill_flags [contr->combat_skill->subtype] & SF_NEED_WEAPON) && tmp->type == WEAPON))
1177 {
1167 wc -= tmp->stats.wc + tmp->magic; 1178 wc -= tmp->stats.wc + tmp->magic;
1168 1179
1169 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1180 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1170 ac -= tmp->stats.ac + tmp->magic; 1181 ac -= tmp->stats.ac + tmp->magic;
1171 1182
1172 stats.dam += tmp->stats.dam + tmp->magic; 1183 stats.dam += tmp->stats.dam + tmp->magic;
1173 weapon_weight = tmp->weight; 1184 weapon_weight = tmp->weight;
1174 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1185 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1175 1186
1176 if (weapon_speed < 0) 1187 if (weapon_speed < 0)
1177 weapon_speed = 0; 1188 weapon_speed = 0;
1178 1189
1179 slaying = tmp->slaying; 1190 slaying = tmp->slaying;
1191
1180 /* If there is desire that two handed weapons should do 1192 /* If there is desire that two handed weapons should do
1181 * extra strength damage, this is where the code should 1193 * extra strength damage, this is where the code should
1182 * go. 1194 * go.
1183 */ 1195 */
1196
1184 current_weapon = tmp; 1197 current_weapon = tmp;
1185 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1198
1199 if (type == PLAYER)
1200 {
1201 contr->combat_ob = tmp;
1202
1203 if (settings.spell_encumbrance)
1186 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1204 contr->encumbrance += tmp->weight * 3 / 1000;
1205 }
1206 }
1187 1207
1188 break; 1208 break;
1189 1209
1190 case ARMOUR: /* Only the best of these three are used: */ 1210 case ARMOUR: /* Only the best of these three are used: */
1191 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1211 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1192 contr->encumbrance += (int) tmp->weight / 1000; 1212 contr->encumbrance += tmp->weight / 1000;
1193 1213
1194 case BRACERS: 1214 case BRACERS:
1195 case FORCE: 1215 case FORCE:
1196 if (tmp->stats.wc) 1216 if (tmp->stats.wc)
1197 { 1217 {
… …
1219 wc -= (tmp->stats.wc + tmp->magic); 1239 wc -= (tmp->stats.wc + tmp->magic);
1220 1240
1221 if (tmp->stats.ac) 1241 if (tmp->stats.ac)
1222 ac -= (tmp->stats.ac + tmp->magic); 1242 ac -= (tmp->stats.ac + tmp->magic);
1223 1243
1224 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max) 1244 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max)
1225 max = ARMOUR_SPEED (tmp) / 10.0; 1245 max = ARMOUR_SPEED (tmp) / 10.f;
1226 1246
1227 break; 1247 break;
1228 } /* switch tmp->type */ 1248 } /* switch tmp->type */
1229 } /* item is equipped */ 1249 } /* item is equipped */
1230 } /* for loop of items */ 1250 } /* for loop of items */
… …
1298 1318
1299 if (mana_obj == this && type == PLAYER) 1319 if (mana_obj == this && type == PLAYER)
1300 stats.maxsp = 1; 1320 stats.maxsp = 1;
1301 else 1321 else
1302 { 1322 {
1303 sp_tmp = 0.0; 1323 sp_tmp = 0.f;
1304 1324
1305 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1325 for (i = 1; i <= mana_obj->level && i <= 10; i++)
1306 { 1326 {
1307 float stmp; 1327 float stmp;
1308 1328
1309 /* Got some extra bonus at first level */ 1329 /* Got some extra bonus at first level */
1310 if (i < 2) 1330 if (i < 2)
1311 stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0); 1331 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1312 else 1332 else
1313 stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0; 1333 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1314 1334
1315 if (stmp < 1.0) 1335 if (stmp < 1.f)
1316 stmp = 1.0; 1336 stmp = 1.f;
1317 1337
1318 sp_tmp += stmp; 1338 sp_tmp += stmp;
1319 } 1339 }
1320 1340
1321 stats.maxsp = (int) sp_tmp; 1341 stats.maxsp = (sint16)sp_tmp;
1322 1342
1323 for (i = 11; i <= mana_obj->level; i++) 1343 for (i = 11; i <= mana_obj->level; i++)
1324 stats.maxsp += 2; 1344 stats.maxsp += 2;
1325 } 1345 }
1326 /* Characters can get their sp supercharged via rune of transferrance */ 1346 /* Characters can get their sp supercharged via rune of transferrance */
… …
1338 /* store grace in a float - this way, the divisions below don't create 1358 /* store grace in a float - this way, the divisions below don't create
1339 * big jumps when you go from level to level - with int's, it then 1359 * big jumps when you go from level to level - with int's, it then
1340 * becomes big jumps when the sums of the bonuses jump to the next 1360 * becomes big jumps when the sums of the bonuses jump to the next
1341 * step of 8 - with floats, even fractional ones are useful. 1361 * step of 8 - with floats, even fractional ones are useful.
1342 */ 1362 */
1343 sp_tmp = 0.0; 1363 sp_tmp = 0.f;
1344 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1364 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)
1345 { 1365 {
1346 float grace_tmp = 0.0; 1366 float grace_tmp = 0.f;
1347 1367
1348 /* Got some extra bonus at first level */ 1368 /* Got some extra bonus at first level */
1349 if (i < 2) 1369 if (i < 2)
1350 grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] + 1370 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1351 2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1352 else 1371 else
1353 grace_tmp = (float) contr->levgrace[i]
1354 + ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0; 1372 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1355 1373
1356 if (grace_tmp < 1.0) 1374 if (grace_tmp < 1.f)
1357 grace_tmp = 1.0; 1375 grace_tmp = 1.f;
1358 1376
1359 sp_tmp += grace_tmp; 1377 sp_tmp += grace_tmp;
1360 } 1378 }
1361 1379
1362 stats.maxgrace = (int) sp_tmp; 1380 stats.maxgrace = (sint16)sp_tmp;
1363 1381
1364 /* two grace points per level after 11 */ 1382 /* two grace points per level after 11 */
1365 for (i = 11; i <= grace_obj->level; i++) 1383 for (i = 11; i <= grace_obj->level; i++)
1366 stats.maxgrace += 2; 1384 stats.maxgrace += 2;
1367 } 1385 }
… …
1408 stats.dam += dam_bonus[stats.Str]; 1426 stats.dam += dam_bonus[stats.Str];
1409 1427
1410 if (stats.dam < 1) 1428 if (stats.dam < 1)
1411 stats.dam = 1; 1429 stats.dam = 1;
1412 1430
1413 speed = 1.0 + speed_bonus[stats.Dex]; 1431 speed = 1.f + speed_bonus[stats.Dex];
1414 1432
1415 if (settings.search_items && contr->search_str[0]) 1433 if (settings.search_items && contr->search_str[0])
1416 speed -= 1; 1434 speed -= 1;
1417 1435
1418 if (attacktype == 0) 1436 if (attacktype == 0)
1419 attacktype = arch->clone.attacktype; 1437 attacktype = arch->clone.attacktype;
1420 1438
1421 } /* End if player */ 1439 } /* End if player */
1422 1440
1423 if (added_speed >= 0) 1441 if (added_speed >= 0)
1424 speed += added_speed / 10.0; 1442 speed += added_speed / 10.f;
1425 else /* Something wrong here...: */ 1443 else /* Something wrong here...: */
1426 speed /= (float) (1.0 - added_speed); 1444 speed /= 1.f - added_speed;
1427 1445
1428 /* Max is determined by armour */ 1446 /* Max is determined by armour */
1429 if (speed > max) 1447 if (speed > max)
1430 speed = max; 1448 speed = max;
1431 1449
… …
1436 * weight limit, then player suffers a speed reduction based on how 1454 * weight limit, then player suffers a speed reduction based on how
1437 * much above he is, and what is max carry is 1455 * much above he is, and what is max carry is
1438 */ 1456 */
1439 f = (carrying / 1000) - max_carry[stats.Str]; 1457 f = (carrying / 1000) - max_carry[stats.Str];
1440 if (f > 0) 1458 if (f > 0)
1441 speed = speed / (1.0 + f / max_carry[stats.Str]); 1459 speed = speed / (1.f + f / max_carry[stats.Str]);
1442 } 1460 }
1443 1461
1444 speed += bonus_speed / 10.0; /* Not affected by limits */ 1462 speed += bonus_speed / 10.f; /* Not affected by limits */
1445 1463
1446 /* Put a lower limit on speed. Note with this speed, you move once every 1464 /* Put a lower limit on speed. Note with this speed, you move once every
1447 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1465 * 100 ticks or so. This amounts to once every 12 seconds of realtime.
1448 */ 1466 */
1449 speed = speed * speed_reduce_from_disease; 1467 speed = speed * speed_reduce_from_disease;
1450 1468
1451 if (speed < 0.01 && type == PLAYER) 1469 if (speed < 0.01f && type == PLAYER)
1452 speed = 0.01; 1470 speed = 0.01f;
1453 1471
1454 if (type == PLAYER) 1472 if (type == PLAYER)
1455 { 1473 {
1456 float M, W, s, D, K, S, M2;
1457
1458 /* (This formula was made by vidarl@ifi.uio.no) 1474 /* (This formula was made by vidarl@ifi.uio.no)
1459 * Note that we never used these values again - basically 1475 * Note that we never used these values again - basically
1460 * all of these could be subbed into one big equation, but 1476 * all of these could be subbed into one big equation, but
1461 * that would just be a real pain to read. 1477 * that would just be a real pain to read.
1462 */ 1478 */
1463 M = (max_carry[stats.Str] - 121) / 121.0; 1479 float M = (max_carry[stats.Str] - 121) / 121.f;
1464 M2 = max_carry[stats.Str] / 100.0; 1480 float M2 = max_carry[stats.Str] / 100.f;
1465 W = weapon_weight / 20000.0; 1481 float W = weapon_weight / 20000.f;
1466 s = 2 - weapon_speed / 10.0; 1482 float s = 2 - weapon_speed / 10.f;
1467 D = (stats.Dex - 14) / 14.0; 1483 float D = (stats.Dex - 14) / 14.f;
1468 K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0; 1484 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1485
1469 K *= (4 + level) / (float) (6 + level) * 1.2; 1486 K *= (4 + level) *1.2f / (6 + level);
1487
1470 if (K <= 0) 1488 if (K <= 0.f)
1471 K = 0.01; 1489 K = 0.01f;
1490
1472 S = speed / (K * s); 1491 float S = speed / (K * s);
1492
1473 contr->weapon_sp = S; 1493 contr->weapon_sp = S;
1474 } 1494 }
1475 1495
1476 /* I want to limit the power of small monsters with big weapons: */ 1496 /* I want to limit the power of small monsters with big weapons: */
1477 if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3) 1497 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)
1478 stats.dam = arch->clone.stats.dam * 3; 1498 stats.dam = arch->clone.stats.dam * 3;
1479 1499
1480 /* Prevent overflows of wc - best you can get is ABS(120) - this 1500 /* Prevent overflows of wc - best you can get is ABS(120) - this
1481 * should be more than enough - remember, AC is also in 8 bits, 1501 * should be more than enough - remember, AC is also in 8 bits,
1482 * so its value is the same. 1502 * so its value is the same.
… …
1531 * false otherwise. 1551 * false otherwise.
1532 */ 1552 */
1533int 1553int
1534allowed_class (const object *op) 1554allowed_class (const object *op)
1535{ 1555{
1536 return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 && 1556 return op->stats.Dex > 0
1537 op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0; 1557 && op->stats.Str > 0
1558 && op->stats.Con > 0
1559 && op->stats.Int > 0
1560 && op->stats.Wis > 0
1561 && op->stats.Pow > 0
1562 && op->stats.Cha > 0;
1538} 1563}
1539 1564
1540/* 1565/*
1541 * set the new dragon name after gaining levels or 1566 * set the new dragon name after gaining levels or
1542 * changing ability focus (later this can be extended to 1567 * changing ability focus (later this can be extended to
… …
1764sint64 1789sint64
1765level_exp (int level, double expmul) 1790level_exp (int level, double expmul)
1766{ 1791{
1767 if (level > settings.max_level) 1792 if (level > settings.max_level)
1768 return (sint64) (expmul * levels[settings.max_level]); 1793 return (sint64) (expmul * levels[settings.max_level]);
1794
1769 return (sint64) (expmul * levels[level]); 1795 return (sint64) (expmul * levels[level]);
1770} 1796}
1771 1797
1772/* 1798/*
1773 * Ensure that the permanent experience requirements in an exp object are met. 1799 * Ensure that the permanent experience requirements in an exp object are met.

Diff Legend

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