| … | |
… | |
| 858 | * then calls this function. |
858 | * then calls this function. |
| 859 | */ |
859 | */ |
| 860 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) |
860 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) |
| 861 | continue; |
861 | continue; |
| 862 | |
862 | |
| 863 | /* See note in map.c:update_position about making this additive |
|
|
| 864 | * since light sources are never applied, need to put check here. |
|
|
| 865 | */ |
|
|
| 866 | glow_radius = max (glow_radius, tmp->glow_radius); |
863 | glow_radius += tmp->glow_radius; |
| 867 | |
864 | |
| 868 | /* For some things, we don't care what is equipped */ |
865 | /* For some things, we don't care what is equipped */ |
| 869 | if (tmp->type == SKILL) |
866 | if (tmp->type == SKILL) |
| 870 | { |
867 | { |
| 871 | /* Want to take the highest skill here. */ |
868 | /* Want to take the highest skill here. */ |
| … | |
… | |
| 1137 | else /* To nullify the below effect */ |
1134 | else /* To nullify the below effect */ |
| 1138 | ac += tmp->stats.ac + tmp->magic; |
1135 | ac += tmp->stats.ac + tmp->magic; |
| 1139 | } |
1136 | } |
| 1140 | |
1137 | |
| 1141 | if (tmp->stats.wc) |
1138 | if (tmp->stats.wc) |
| 1142 | wc -= (tmp->stats.wc + tmp->magic); |
1139 | wc -= tmp->stats.wc + tmp->magic; |
| 1143 | |
1140 | |
| 1144 | if (tmp->stats.ac) |
1141 | if (tmp->stats.ac) |
| 1145 | ac -= (tmp->stats.ac + tmp->magic); |
1142 | ac -= tmp->stats.ac + tmp->magic; |
| 1146 | |
1143 | |
| 1147 | if (ARMOUR_SPEED (tmp)) |
1144 | if (ARMOUR_SPEED (tmp)) |
| 1148 | max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); |
1145 | max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); |
| 1149 | |
1146 | |
| 1150 | break; |
1147 | break; |
| 1151 | } /* switch tmp->type */ |
1148 | } /* switch tmp->type */ |
| 1152 | } /* item is equipped */ |
1149 | } /* item is equipped */ |
| 1153 | } /* for loop of items */ |
1150 | } /* for loop of items */ |
| 1154 | fprintf (stderr, "gr %s %d\n", &name, glow_radius);//D |
1151 | |
|
|
1152 | glow_radius = min (glow_radius, MAX_LIGHT_RADIUS); |
| 1155 | |
1153 | |
| 1156 | /* We've gone through all the objects the player has equipped. For many things, we |
1154 | /* We've gone through all the objects the player has equipped. For many things, we |
| 1157 | * have generated intermediate values which we now need to assign. |
1155 | * have generated intermediate values which we now need to assign. |
| 1158 | */ |
1156 | */ |
| 1159 | |
1157 | |
| … | |
… | |
| 1329 | |
1327 | |
| 1330 | speed = 1.f + speed_bonus[stats.Dex]; |
1328 | speed = 1.f + speed_bonus[stats.Dex]; |
| 1331 | |
1329 | |
| 1332 | if (settings.search_items && contr->search_str[0]) |
1330 | if (settings.search_items && contr->search_str[0]) |
| 1333 | speed -= 1; |
1331 | speed -= 1; |
| 1334 | |
|
|
| 1335 | if (attacktype == 0) |
|
|
| 1336 | attacktype = arch->attacktype; |
|
|
| 1337 | } /* End if player */ |
1332 | } /* End if player */ |
| 1338 | |
1333 | |
| 1339 | if (added_speed >= 0) |
1334 | if (added_speed >= 0) |
| 1340 | speed += added_speed / 10.f; |
1335 | speed += added_speed / 10.f; |
| 1341 | else /* Something wrong here...: */ |
1336 | else /* Something wrong here...: */ |
| … | |
… | |
| 1420 | // update the mapspace, if we are on a map |
1415 | // update the mapspace, if we are on a map |
| 1421 | if (!flag [FLAG_REMOVED] && map) |
1416 | if (!flag [FLAG_REMOVED] && map) |
| 1422 | map->at (x, y).flags_ = 0; |
1417 | map->at (x, y).flags_ = 0; |
| 1423 | } |
1418 | } |
| 1424 | |
1419 | |
|
|
1420 | void |
|
|
1421 | object::set_glow_radius (sint8 rad) |
|
|
1422 | { |
|
|
1423 | glow_radius = rad; |
|
|
1424 | |
|
|
1425 | if (is_on_map ()) |
|
|
1426 | update_all_los (map, x, y); |
|
|
1427 | else if (object *env = outer_env ()) |
|
|
1428 | { |
|
|
1429 | env->update_stats (); |
|
|
1430 | |
|
|
1431 | if (env->is_on_map ()) |
|
|
1432 | update_all_los (env->map, env->x, env->y); |
|
|
1433 | } |
|
|
1434 | } |
|
|
1435 | |
| 1425 | /* |
1436 | /* |
| 1426 | * Returns true if the given player is a legal class. |
1437 | * Returns true if the given player is a legal class. |
| 1427 | * The function to add and remove class-bonuses to the stats doesn't |
1438 | * The function to add and remove class-bonuses to the stats doesn't |
| 1428 | * check if the stat becomes negative, thus this function |
1439 | * check if the stat becomes negative, thus this function |
| 1429 | * merely checks that all stats are 1 or more, and returns |
1440 | * merely checks that all stats are 1 or more, and returns |
| … | |
… | |
| 1770 | player_lvl_adj (op, skill_obj); |
1781 | player_lvl_adj (op, skill_obj); |
| 1771 | } |
1782 | } |
| 1772 | } |
1783 | } |
| 1773 | |
1784 | |
| 1774 | /* This function checks to make sure that object 'op' can |
1785 | /* This function checks to make sure that object 'op' can |
| 1775 | * lost 'exp' experience. It returns the amount of exp |
1786 | * lose 'exp' experience. It returns the amount of exp |
| 1776 | * object 'op' can in fact lose - it basically makes |
1787 | * object 'op' can in fact lose - it basically makes |
| 1777 | * adjustments based on permanent exp and the like. |
1788 | * adjustments based on permanent exp and the like. |
| 1778 | * This function should always be used for losing experience - |
1789 | * This function should always be used for losing experience - |
| 1779 | * the 'exp' value passed should be positive - this is the |
1790 | * the 'exp' value passed should be positive - this is the |
| 1780 | * amount that should get subtract from the player. |
1791 | * amount that should get subtract from the player. |
| … | |
… | |
| 1784 | { |
1795 | { |
| 1785 | sint64 del_exp; |
1796 | sint64 del_exp; |
| 1786 | |
1797 | |
| 1787 | if (exp > op->stats.exp) |
1798 | if (exp > op->stats.exp) |
| 1788 | exp = op->stats.exp; |
1799 | exp = op->stats.exp; |
|
|
1800 | |
| 1789 | if (settings.permanent_exp_ratio) |
1801 | if (settings.permanent_exp_ratio) |
| 1790 | { |
1802 | { |
| 1791 | del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); |
1803 | del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); |
|
|
1804 | |
| 1792 | if (del_exp < 0) |
1805 | if (del_exp < 0) |
| 1793 | del_exp = 0; |
1806 | del_exp = 0; |
|
|
1807 | |
| 1794 | if (exp > del_exp) |
1808 | if (exp > del_exp) |
| 1795 | exp = del_exp; |
1809 | exp = del_exp; |
| 1796 | } |
1810 | } |
|
|
1811 | |
| 1797 | return exp; |
1812 | return exp; |
| 1798 | } |
1813 | } |
| 1799 | |
1814 | |
| 1800 | sint64 |
1815 | sint64 |
| 1801 | check_exp_adjust (const object *op, sint64 exp) |
1816 | check_exp_adjust (const object *op, sint64 exp) |
| 1802 | { |
1817 | { |
| 1803 | if (exp < 0) |
1818 | if (exp < 0) |
| 1804 | return check_exp_loss (op, exp); |
1819 | return check_exp_loss (op, exp); |
| 1805 | else |
1820 | else |
| 1806 | return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); |
1821 | return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp); |
| 1807 | } |
1822 | } |
| 1808 | |
1823 | |
| 1809 | /* Subtracts experience from player. |
1824 | /* Subtracts experience from player. |
| 1810 | * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we |
1825 | * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we |
| 1811 | * only subtract from the matching skill. Otherwise, |
1826 | * only subtract from the matching skill. Otherwise, |
| … | |
… | |
| 1924 | * amount of permenent experience, whichever gives the lowest loss. |
1939 | * amount of permenent experience, whichever gives the lowest loss. |
| 1925 | */ |
1940 | */ |
| 1926 | void |
1941 | void |
| 1927 | apply_death_exp_penalty (object *op) |
1942 | apply_death_exp_penalty (object *op) |
| 1928 | { |
1943 | { |
| 1929 | object *tmp; |
|
|
| 1930 | sint64 loss; |
1944 | sint64 loss; |
| 1931 | sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ |
1945 | sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ |
| 1932 | sint64 level_loss; /* defined by the setting 'death_penalty_levels */ |
1946 | sint64 level_loss; /* defined by the setting 'death_penalty_levels */ |
| 1933 | |
1947 | |
| 1934 | for (tmp = op->inv; tmp; tmp = tmp->below) |
1948 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1935 | if (tmp->type == SKILL && tmp->stats.exp) |
1949 | if (tmp->type == SKILL && tmp->stats.exp) |
| 1936 | { |
1950 | { |
| 1937 | |
|
|
| 1938 | percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; |
1951 | percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; |
| 1939 | level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; |
1952 | level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; |
| 1940 | |
1953 | |
| 1941 | /* With the revised exp system, you can get cases where |
1954 | /* With the revised exp system, you can get cases where |
| 1942 | * losing several levels would still require that you have more |
1955 | * losing several levels would still require that you have more |
| … | |
… | |
| 1944 | * tables is a lot harder. |
1957 | * tables is a lot harder. |
| 1945 | */ |
1958 | */ |
| 1946 | if (level_loss < 0) |
1959 | if (level_loss < 0) |
| 1947 | level_loss = 0; |
1960 | level_loss = 0; |
| 1948 | |
1961 | |
| 1949 | loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); |
1962 | loss = check_exp_loss (tmp, min (level_loss, percentage_loss)); |
| 1950 | |
1963 | |
| 1951 | tmp->stats.exp -= loss; |
1964 | tmp->stats.exp -= loss; |
| 1952 | player_lvl_adj (op, tmp); |
1965 | player_lvl_adj (op, tmp); |
| 1953 | } |
1966 | } |
| 1954 | |
1967 | |
| 1955 | percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; |
1968 | percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; |
| 1956 | level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; |
1969 | level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)]; |
| 1957 | |
1970 | |
| 1958 | if (level_loss < 0) |
1971 | if (level_loss < 0) |
| 1959 | level_loss = 0; |
1972 | level_loss = 0; |
|
|
1973 | |
| 1960 | loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); |
1974 | loss = check_exp_loss (op, min (level_loss, percentage_loss)); |
| 1961 | |
1975 | |
| 1962 | op->stats.exp -= loss; |
1976 | op->stats.exp -= loss; |
| 1963 | player_lvl_adj (op, NULL); |
1977 | player_lvl_adj (op, NULL); |
| 1964 | } |
1978 | } |
| 1965 | |
1979 | |
