… | |
… | |
1373 | { |
1373 | { |
1374 | new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); |
1374 | new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); |
1375 | return 0; |
1375 | return 0; |
1376 | } |
1376 | } |
1377 | |
1377 | |
|
|
1378 | tmp = tmp->head_ (); |
|
|
1379 | |
1378 | /* If we've already got a force of this type, don't add a new one. */ |
1380 | /* If we've already got a force of this type, don't add a new one. */ |
1379 | for (force = tmp->inv; force != NULL; force = force->below) |
1381 | for (force = tmp->inv; force; force = force->below) |
1380 | { |
1382 | { |
1381 | if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) |
1383 | if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) |
1382 | { |
1384 | { |
1383 | if (force->name == spell_ob->name) |
1385 | if (force->name == spell_ob->name) |
1384 | { |
1386 | { |
… | |
… | |
1390 | return 0; |
1392 | return 0; |
1391 | } |
1393 | } |
1392 | } |
1394 | } |
1393 | } |
1395 | } |
1394 | |
1396 | |
1395 | if (force == NULL) |
1397 | if (!force) |
1396 | { |
1398 | { |
1397 | force = get_archetype (FORCE_NAME); |
1399 | force = get_archetype (FORCE_NAME); |
1398 | force->subtype = FORCE_CHANGE_ABILITY; |
1400 | force->subtype = FORCE_CHANGE_ABILITY; |
|
|
1401 | |
1399 | if (spell_ob->race) |
1402 | if (spell_ob->race) |
1400 | force->name = spell_ob->race; |
1403 | force->name = spell_ob->race; |
1401 | else |
1404 | else |
1402 | force->name = spell_ob->name; |
1405 | force->name = spell_ob->name; |
1403 | |
1406 | |
… | |
… | |
1413 | { |
1416 | { |
1414 | force->duration = duration; |
1417 | force->duration = duration; |
1415 | new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); |
1418 | new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); |
1416 | } |
1419 | } |
1417 | else |
1420 | else |
1418 | { |
|
|
1419 | new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); |
1421 | new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); |
1420 | } |
1422 | |
1421 | return 1; |
1423 | return 1; |
1422 | } |
1424 | } |
|
|
1425 | |
1423 | force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; |
1426 | force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; |
1424 | force->speed = 1.f; |
1427 | force->speed = 1.f; |
1425 | force->speed_left = -1.f; |
1428 | force->speed_left = -1.f; |
1426 | SET_FLAG (force, FLAG_APPLIED); |
1429 | SET_FLAG (force, FLAG_APPLIED); |
1427 | |
1430 | |
… | |
… | |
1958 | |
1961 | |
1959 | m->insert (tmp, x, y, op); |
1962 | m->insert (tmp, x, y, op); |
1960 | return 1; |
1963 | return 1; |
1961 | } |
1964 | } |
1962 | |
1965 | |
1963 | |
|
|
1964 | |
|
|
1965 | |
|
|
1966 | /* cast_cause_disease: this spell looks along <dir> from the |
1966 | /* cast_cause_disease: this spell looks along <dir> from the |
1967 | * player and infects someone. |
1967 | * player and infects someone. |
1968 | * op is the player/monster, caster is the object, dir is the direction |
1968 | * op is the player/monster, caster is the object, dir is the direction |
1969 | * to cast, disease_arch is the specific disease, and type is the spell number |
1969 | * to cast, disease_arch is the specific disease, and type is the spell number |
1970 | * perhaps this should actually be in disease.c? |
1970 | * perhaps this should actually be in disease.c? |
1971 | */ |
1971 | */ |
1972 | |
|
|
1973 | int |
1972 | int |
1974 | cast_cause_disease (object *op, object *caster, object *spell, int dir) |
1973 | cast_cause_disease (object *op, object *caster, object *spell, int dir) |
1975 | { |
1974 | { |
1976 | sint16 x, y; |
1975 | sint16 x, y; |
1977 | int i, mflags, range, dam_mod, dur_mod; |
1976 | int i, mflags, range, dam_mod, dur_mod; |
… | |
… | |
1984 | /* If casting from a scroll, no direction will be available, so refer to the |
1983 | /* If casting from a scroll, no direction will be available, so refer to the |
1985 | * direction the player is pointing. |
1984 | * direction the player is pointing. |
1986 | */ |
1985 | */ |
1987 | if (!dir) |
1986 | if (!dir) |
1988 | dir = op->facing; |
1987 | dir = op->facing; |
|
|
1988 | |
1989 | if (!dir) |
1989 | if (!dir) |
1990 | return 0; /* won't find anything if casting on ourself, so just return */ |
1990 | return 0; /* won't find anything if casting on ourself, so just return */ |
1991 | |
1991 | |
1992 | /* Calculate these once here */ |
1992 | /* Calculate these once here */ |
1993 | range = spell->range + SP_level_range_adjust (caster, spell); |
1993 | range = spell->range + SP_level_range_adjust (caster, spell); |
… | |
… | |
2027 | /* do level adjustments */ |
2027 | /* do level adjustments */ |
2028 | if (disease->stats.wc) |
2028 | if (disease->stats.wc) |
2029 | disease->stats.wc += dur_mod / 2; |
2029 | disease->stats.wc += dur_mod / 2; |
2030 | |
2030 | |
2031 | if (disease->magic > 0) |
2031 | if (disease->magic > 0) |
2032 | disease->magic += dur_mod / 4; |
2032 | disease->magic += dur_mod / 8; |
2033 | |
2033 | |
2034 | if (disease->stats.maxhp > 0) |
2034 | if (disease->stats.maxhp > 0) |
2035 | disease->stats.maxhp += dur_mod; |
2035 | disease->stats.maxhp += dur_mod; |
2036 | |
2036 | |
2037 | if (disease->stats.maxgrace > 0) |
2037 | if (disease->stats.maxgrace > 0) |