… | |
… | |
723 | int i, j; |
723 | int i, j; |
724 | float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; |
724 | float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; |
725 | int weapon_weight = 0, weapon_speed = 0; |
725 | int weapon_weight = 0, weapon_speed = 0; |
726 | int best_wc = 0, best_ac = 0, wc = 0, ac = 0; |
726 | int best_wc = 0, best_ac = 0, wc = 0, ac = 0; |
727 | int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; |
727 | int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; |
728 | object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; |
728 | object *grace_obj = NULL, *mana_obj = NULL, *tmp; |
729 | float old_speed = speed; |
729 | float old_speed = speed; |
730 | |
730 | |
731 | /* First task is to clear all the values back to their original values */ |
731 | /* First task is to clear all the values back to their original values */ |
732 | if (type == PLAYER) |
732 | if (type == PLAYER) |
733 | { |
733 | { |
… | |
… | |
866 | && tmp->subtype == SK_PRAYING)) |
866 | && tmp->subtype == SK_PRAYING)) |
867 | { |
867 | { |
868 | if (type == PLAYER) |
868 | if (type == PLAYER) |
869 | { |
869 | { |
870 | if (tmp == contr->combat_ob || tmp == contr->ranged_ob) |
870 | if (tmp == contr->combat_ob || tmp == contr->ranged_ob) |
|
|
871 | if (tmp != current_weapon |
871 | if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)) |
872 | && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) |
|
|
873 | && !tmp->flag [FLAG_CURSED] |
|
|
874 | && !tmp->flag [FLAG_DAMNED]) |
872 | continue; |
875 | continue; |
873 | |
876 | |
874 | for (i = 0; i < NUM_STATS; i++) |
877 | for (i = 0; i < NUM_STATS; i++) |
875 | change_attr_value (&stats, i, tmp->stats.stat (i)); |
878 | change_attr_value (&stats, i, tmp->stats.stat (i)); |
876 | |
879 | |
877 | /* these are the items that currently can change digestion, regeneration, |
880 | /* These are the items that currently can change digestion, regeneration, |
878 | * spell point recovery and mana point recovery. Seems sort of an arbitary |
881 | * spell point recovery and mana point recovery. Seems sort of an arbitary |
879 | * list, but other items store other info into stats array. |
882 | * list, but other items store other info into stats array. |
880 | */ |
883 | */ |
881 | if (tmp->type == WEAPON || tmp->type == BOW || |
884 | if (tmp->type == WEAPON || tmp->type == BOW || |
882 | tmp->type == ARMOUR || tmp->type == HELMET || |
885 | tmp->type == ARMOUR || tmp->type == HELMET || |
883 | tmp->type == SHIELD || tmp->type == RING || |
886 | tmp->type == SHIELD || tmp->type == RING || |
… | |
… | |
991 | #endif |
994 | #endif |
992 | |
995 | |
993 | /* skills modifying the character -b.t. */ |
996 | /* skills modifying the character -b.t. */ |
994 | /* for all skills and skill granting objects */ |
997 | /* for all skills and skill granting objects */ |
995 | case SKILL: |
998 | case SKILL: |
996 | if (!QUERY_FLAG (tmp, FLAG_APPLIED)) |
999 | if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY) |
997 | break; |
1000 | break; |
998 | |
1001 | |
999 | if (IS_COMBAT_SKILL (tmp->subtype)) |
|
|
1000 | wc_obj = tmp; |
|
|
1001 | |
|
|
1002 | if (chosen_skill) |
1002 | if (chosen_skill) |
1003 | LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); |
1003 | LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n", |
|
|
1004 | &name, &chosen_skill->name, &tmp->name); |
1004 | |
1005 | |
1005 | chosen_skill = tmp; |
1006 | chosen_skill = tmp; |
1006 | |
1007 | |
1007 | if (tmp->stats.dam > 0) |
1008 | if (tmp->stats.dam > 0) |
1008 | { /* skill is a 'weapon' */ |
1009 | { /* skill is a 'weapon' */ |
… | |
… | |
1029 | ac -= tmp->stats.ac + tmp->magic; |
1030 | ac -= tmp->stats.ac + tmp->magic; |
1030 | |
1031 | |
1031 | if (settings.spell_encumbrance == TRUE && type == PLAYER) |
1032 | if (settings.spell_encumbrance == TRUE && type == PLAYER) |
1032 | contr->encumbrance += (int) 3 *tmp->weight / 1000; |
1033 | contr->encumbrance += (int) 3 *tmp->weight / 1000; |
1033 | |
1034 | |
1034 | break; |
|
|
1035 | |
|
|
1036 | case SKILL_TOOL: |
|
|
1037 | if (chosen_skill) |
|
|
1038 | LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); |
|
|
1039 | |
|
|
1040 | chosen_skill = tmp; |
|
|
1041 | break; |
1035 | break; |
1042 | |
1036 | |
1043 | case SHIELD: |
1037 | case SHIELD: |
1044 | if (settings.spell_encumbrance == TRUE && type == PLAYER) |
1038 | if (settings.spell_encumbrance == TRUE && type == PLAYER) |
1045 | contr->encumbrance += (int) tmp->weight / 2000; |
1039 | contr->encumbrance += (int) tmp->weight / 2000; |
… | |
… | |
1288 | * improvement every level, now its fighterlevel/5. So |
1282 | * improvement every level, now its fighterlevel/5. So |
1289 | * we give the player a bonus here in wc and dam |
1283 | * we give the player a bonus here in wc and dam |
1290 | * to make up for the change. Note that I left the |
1284 | * to make up for the change. Note that I left the |
1291 | * monster bonus the same as before. -b.t. |
1285 | * monster bonus the same as before. -b.t. |
1292 | */ |
1286 | */ |
|
|
1287 | object *wc_obj = chosen_skill; |
1293 | |
1288 | |
1294 | if (contr && wc_obj && wc_obj->level > 1) |
1289 | if (contr && wc_obj && wc_obj->level > 1) |
1295 | { |
1290 | { |
1296 | wc -= wc_obj->level + thaco_bonus[stats.Str]; |
1291 | wc -= wc_obj->level + thaco_bonus[stats.Str]; |
1297 | |
1292 | |
… | |
… | |
1319 | if (settings.search_items && contr->search_str[0]) |
1314 | if (settings.search_items && contr->search_str[0]) |
1320 | speed -= 1; |
1315 | speed -= 1; |
1321 | |
1316 | |
1322 | if (attacktype == 0) |
1317 | if (attacktype == 0) |
1323 | attacktype = arch->clone.attacktype; |
1318 | attacktype = arch->clone.attacktype; |
1324 | |
|
|
1325 | } /* End if player */ |
1319 | } /* End if player */ |
1326 | |
1320 | |
1327 | if (added_speed >= 0) |
1321 | if (added_speed >= 0) |
1328 | speed += added_speed / 10.f; |
1322 | speed += added_speed / 10.f; |
1329 | else /* Something wrong here...: */ |
1323 | else /* Something wrong here...: */ |
… | |
… | |
1363 | * that would just be a real pain to read. |
1357 | * that would just be a real pain to read. |
1364 | */ |
1358 | */ |
1365 | float M = (max_carry[stats.Str] - 121) / 121.f; |
1359 | float M = (max_carry[stats.Str] - 121) / 121.f; |
1366 | float M2 = max_carry[stats.Str] / 100.f; |
1360 | float M2 = max_carry[stats.Str] / 100.f; |
1367 | float W = weapon_weight / 20000.f; |
1361 | float W = weapon_weight / 20000.f; |
1368 | float s = 2 - weapon_speed / 10.f; |
1362 | float s = (20 - weapon_speed) / 10.f; |
1369 | float D = (stats.Dex - 14) / 14.f; |
1363 | float D = (stats.Dex - 14) / 14.f; |
1370 | float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f; |
1364 | float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f; |
1371 | |
1365 | |
1372 | K *= (4 + level) *1.2f / (6 + level); |
1366 | K *= (4 + level) * 1.2f / (6 + level); |
1373 | |
1367 | |
1374 | if (K <= 0.f) |
1368 | if (K <= 0.01f) |
1375 | K = 0.01f; |
1369 | K = 0.01f; |
1376 | |
1370 | |
1377 | float S = speed / (K * s); |
1371 | contr->weapon_sp = K * s * .5f; //TODO: balance the .5 |
1378 | |
|
|
1379 | contr->weapon_sp = S; |
|
|
1380 | } |
1372 | } |
1381 | |
1373 | |
1382 | /* I want to limit the power of small monsters with big weapons: */ |
1374 | /* I want to limit the power of small monsters with big weapons: */ |
1383 | if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) |
1375 | if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) |
1384 | stats.dam = arch->clone.stats.dam * 3; |
1376 | stats.dam = arch->clone.stats.dam * 3; |
1385 | |
1377 | |
1386 | /* Prevent overflows of wc - best you can get is ABS(120) - this |
1378 | stats.wc = clamp (wc, MIN_WC, MAX_WC); |
1387 | * should be more than enough - remember, AC is also in 8 bits, |
1379 | stats.ac = clamp (ac, MIN_AC, MAX_AC); |
1388 | * so its value is the same. |
|
|
1389 | */ |
|
|
1390 | if (wc > 120) |
|
|
1391 | wc = 120; |
|
|
1392 | else if (wc < -120) |
|
|
1393 | wc = -120; |
|
|
1394 | |
|
|
1395 | stats.wc = wc; |
|
|
1396 | |
|
|
1397 | if (ac > 120) |
|
|
1398 | ac = 120; |
|
|
1399 | else if (ac < -120) |
|
|
1400 | ac = -120; |
|
|
1401 | |
|
|
1402 | stats.ac = ac; |
|
|
1403 | |
1380 | |
1404 | /* if for some reason the creature doesn't have any move type, |
1381 | /* if for some reason the creature doesn't have any move type, |
1405 | * give them walking as a default. |
1382 | * give them walking as a default. |
1406 | * The second case is a special case - to more closely mimic the |
1383 | * The second case is a special case - to more closely mimic the |
1407 | * old behaviour - if your flying, your not walking - just |
1384 | * old behaviour - if your flying, your not walking - just |
… | |
… | |
1587 | if (!skill_obj) |
1564 | if (!skill_obj) |
1588 | { |
1565 | { |
1589 | LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); |
1566 | LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); |
1590 | return NULL; |
1567 | return NULL; |
1591 | } |
1568 | } |
|
|
1569 | |
1592 | /* clear the flag - exp goes into this bucket, but player |
1570 | /* clear the flag - exp goes into this bucket, but player |
1593 | * still doesn't know it. |
1571 | * still doesn't know it. |
1594 | */ |
1572 | */ |
1595 | CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); |
1573 | CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); |
1596 | skill_obj->stats.exp = 0; |
1574 | skill_obj->stats.exp = 0; |
1597 | skill_obj->level = 1; |
1575 | skill_obj->level = 1; |
1598 | insert_ob_in_ob (skill_obj, op); |
1576 | insert_ob_in_ob (skill_obj, op); |
1599 | |
1577 | |
1600 | if (op->contr) |
1578 | if (player *pl = op->contr) |
1601 | { |
1579 | { |
1602 | op->contr->last_skill_ob [skill_obj->subtype] = skill_obj; |
1580 | pl->last_skill_ob [skill_obj->subtype] = skill_obj; |
1603 | if (op->contr->ns) |
1581 | if (pl->ns) |
1604 | op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous |
1582 | pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous |
1605 | } |
1583 | } |
1606 | |
1584 | |
1607 | return skill_obj; |
1585 | return skill_obj; |
1608 | } |
1586 | } |
1609 | |
1587 | |
… | |
… | |
1980 | player_lvl_adj (op, tmp); |
1958 | player_lvl_adj (op, tmp); |
1981 | } |
1959 | } |
1982 | |
1960 | |
1983 | percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; |
1961 | percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; |
1984 | level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; |
1962 | level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; |
|
|
1963 | |
1985 | if (level_loss < 0) |
1964 | if (level_loss < 0) |
1986 | level_loss = 0; |
1965 | level_loss = 0; |
1987 | loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); |
1966 | loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); |
1988 | |
1967 | |
1989 | op->stats.exp -= loss; |
1968 | op->stats.exp -= loss; |