ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_effect.C
(Generate patch)

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.83 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.95 by root, Thu Jan 1 16:05:13 2009 UTC

… …
61{ 61{
62 object *wand, *tmp; 62 object *wand, *tmp;
63 int ncharges; 63 int ncharges;
64 64
65 wand = find_marked_object (op); 65 wand = find_marked_object (op);
66 if (wand == NULL || wand->type != WAND) 66 if (!wand || wand->type != WAND)
67 { 67 {
68 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge."); 68 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge.");
69 return 0; 69 return 0;
70 } 70 }
71 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
… …
301 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC)) 301 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))
302 { 302 {
303 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 303 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
304 return 0; 304 return 0;
305 } 305 }
306
306 if (mflags & P_IS_ALIVE) 307 if (mflags & P_IS_ALIVE)
307 { 308 {
308 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 309 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
309 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 310 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
310 { 311 {
311 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 312 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
312 if (tmp->head != NULL) 313 if (tmp->head != NULL)
313 tmp = tmp->head; 314 tmp = tmp->head;
… …
344 345
345 return 1; 346 return 1;
346 } 347 }
347 348
348 /* invis_race is set if we get here */ 349 /* invis_race is set if we get here */
349 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 350 if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
350 return 1; 351 return 1;
351 352
352 /* No race, can't be invisible to it */ 353 /* No race, can't be invisible to it */
353 if (!mon->race) 354 if (!mon->race)
354 return 0; 355 return 0;
355 356
356 if (strstr (mon->race, pl->contr->invis_race)) 357 if (mon->race.contains (pl->contr->invis_race))
357 return 1; 358 return 1;
358 359
359 /* Nothing matched above, return 0 */ 360 /* Nothing matched above, return 0 */
360 return 0; 361 return 0;
361 } 362 }
… …
491 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 492 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
492 return 1; 493 return 1;
493 } 494 }
494 495
495 dummy = get_archetype (FORCE_NAME); 496 dummy = get_archetype (FORCE_NAME);
496 if (dummy == NULL) 497
498 if (!dummy)
497 { 499 {
498 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 500 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
499 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 501 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
500 return 0; 502 return 0;
501 } 503 }
… …
571 573
572 dynbuf_text buf; 574 dynbuf_text buf;
573 575
574 if (player *pl = op->contr) 576 if (player *pl = op->contr)
575 if (object *race = archetype::find (op->race)) 577 if (object *race = archetype::find (op->race))
576 buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n"; 578 buf << " - You are a G<male|female> " << &race->name << ".\n";
577 579
578 if (object *god = find_god (determine_god (op))) 580 if (object *god = find_god (determine_god (op)))
579 buf << "You worship " << &god->name << ".\n"; 581 buf << " - You worship " << &god->name << ".\n";
580 else 582 else
581 buf << "You worship no god.\n"; 583 buf << " - You worship no god.\n";
582 584
583 object *tmp = present_arch_in_ob (at, op); 585 object *tmp = present_arch_in_ob (at, op);
584 586
585 if (*cp == '\0' && tmp == NULL) 587 if (*cp == '\0' && !tmp)
586 buf << "You feel very mundane. "; 588 buf << " - You feel very mundane. ";
587 else 589 else
588 { 590 {
589 buf << "You have: " << cp << ".\n"; 591 buf << " - You have: " << cp << ".\n";
590 592
591 if (tmp) 593 if (tmp)
592 for (int i = 0; i < NUM_STATS; i++) 594 for (int i = 0; i < NUM_STATS; i++)
593 if (tmp->stats.stat (i) < 0) 595 if (tmp->stats.stat (i) < 0)
594 buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i)); 596 buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
595 } 597 }
596 598
597 if (is_dragon_pl (op)) 599 if (is_dragon_pl (op))
598 /* now grab the 'dragon_ability'-force from the player's inventory */ 600 /* now grab the 'dragon_ability'-force from the player's inventory */
599 for (tmp = op->inv; tmp; tmp = tmp->below) 601 for (tmp = op->inv; tmp; tmp = tmp->below)
600 { 602 {
601 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force) 603 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
602 { 604 {
603 if (tmp->stats.exp == 0) 605 if (tmp->stats.exp == 0)
604 buf << "Your metabolism isn't focused on anything.\n"; 606 buf << " - Your metabolism isn't focused on anything.\n";
605 else 607 else
606 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n"; 608 buf << " - Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
607 609
608 break; 610 break;
609 } 611 }
610 } 612 }
611 613
… …
707 */ 709 */
708 if (tmp->type != EARTHWALL) //TODO 710 if (tmp->type != EARTHWALL) //TODO
709 tmp->set_owner (op); 711 tmp->set_owner (op);
710 712
711 set_spell_skill (op, caster, spell_ob, tmp); 713 set_spell_skill (op, caster, spell_ob, tmp);
712 tmp->level = caster_level (caster, spell_ob) / 2; 714 tmp->level = casting_level (caster, spell_ob) / 2;
713 715
714 name = tmp->name; 716 name = tmp->name;
715 if (!(tmp = m->insert (tmp, x, y, op))) 717 if (!(tmp = m->insert (tmp, x, y, op)))
716 { 718 {
717 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 719 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
… …
1034}; 1036};
1035 1037
1036int 1038int
1037cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1039cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1038{ 1040{
1039 object *force = NULL; 1041 object *force = 0;
1040 int i; 1042 int i;
1041 1043
1042 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1044 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1043 object *tmp = dir 1045 object *tmp = dir
1044 ? find_target_for_friendly_spell (op, dir) 1046 ? find_target_for_friendly_spell (op, dir)
1045 : op; 1047 : op;
1046 1048
1047 if (!tmp) 1049 if (!tmp)
1048 return 0; 1050 return 0;
1049 1051
1050 /* If we've already got a force of this type, don't add a new one. */ 1052 /* If we've already got a force of this type, don't add a new one. */
… …
1059 } 1061 }
1060 else if (spell_ob->race && spell_ob->race == tmp2->name) 1062 else if (spell_ob->race && spell_ob->race == tmp2->name)
1061 { 1063 {
1062 if (!silent) 1064 if (!silent)
1063 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl); 1065 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
1066
1064 return 0; 1067 return 0;
1065 } 1068 }
1066 } 1069 }
1067 } 1070 }
1068 if (force == NULL) 1071
1072 if (!force)
1069 { 1073 {
1070 force = get_archetype (FORCE_NAME); 1074 force = get_archetype (FORCE_NAME);
1071 force->subtype = FORCE_CHANGE_ABILITY; 1075 force->subtype = FORCE_CHANGE_ABILITY;
1076
1072 if (spell_ob->race) 1077 if (spell_ob->race)
1073 force->name = spell_ob->race; 1078 force->name = spell_ob->race;
1074 else 1079 else
1075 force->name = spell_ob->name; 1080 force->name = spell_ob->name;
1081
1076 force->name_pl = spell_ob->name; 1082 force->name_pl = spell_ob->name;
1077 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 1083 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1078 1084
1079 } 1085 }
1080 else 1086 else
… …
1086 { 1092 {
1087 force->duration = duration; 1093 force->duration = duration;
1088 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1094 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1089 } 1095 }
1090 else 1096 else
1091 {
1092 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1097 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1093 }
1094 1098
1095 return 1; 1099 return 1;
1096 } 1100 }
1097 1101
1098 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1102 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
… …
1170 */ 1174 */
1171int 1175int
1172cast_bless (object *op, object *caster, object *spell_ob, int dir) 1176cast_bless (object *op, object *caster, object *spell_ob, int dir)
1173{ 1177{
1174 int i; 1178 int i;
1175 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1179 object *god = find_god (determine_god (op)), *force = NULL, *tmp;
1176 1180
1177 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1181 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1178 if (dir != 0) 1182 if (dir != 0)
1179 { 1183 {
1180 tmp = find_target_for_friendly_spell (op, dir); 1184 tmp = find_target_for_friendly_spell (op, dir);
1185
1186 if (!tmp)
1187 return 0;
1181 } 1188 }
1182 else 1189 else
1183 {
1184 tmp = op; 1190 tmp = op;
1185 }
1186 1191
1187 /* If we've already got a force of this type, don't add a new one. */ 1192 /* If we've already got a force of this type, don't add a new one. */
1188 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1193 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1189 { 1194 {
1190 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1195 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1191 { 1196 {
1192 if (tmp2->name == spell_ob->name) 1197 if (tmp2->name == spell_ob->name)
1193 { 1198 {
… …
1199 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl); 1204 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
1200 return 0; 1205 return 0;
1201 } 1206 }
1202 } 1207 }
1203 } 1208 }
1209
1204 if (force == NULL) 1210 if (force == NULL)
1205 { 1211 {
1206 force = get_archetype (FORCE_NAME); 1212 force = get_archetype (FORCE_NAME);
1207 force->subtype = FORCE_CHANGE_ABILITY; 1213 force->subtype = FORCE_CHANGE_ABILITY;
1208 if (spell_ob->race) 1214 if (spell_ob->race)
… …
1422 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1428 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1423 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1429 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1424 { 1430 {
1425 was_one++; 1431 was_one++;
1426 1432
1427 if (tmp->level <= caster_level (caster, spell)) 1433 if (tmp->level <= casting_level (caster, spell))
1428 { 1434 {
1429 success++; 1435 success++;
1430 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1436 if (QUERY_FLAG (spell, FLAG_DAMNED))
1431 CLEAR_FLAG (tmp, FLAG_DAMNED); 1437 CLEAR_FLAG (tmp, FLAG_DAMNED);
1432 1438
… …
1473 { 1479 {
1474 identify (tmp); 1480 identify (tmp);
1475 1481
1476 if (op->type == PLAYER) 1482 if (op->type == PLAYER)
1477 { 1483 {
1478 buf.printf ("You identified: %s.\n\n", long_desc (tmp, op)); 1484 buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1479 1485
1480 if (tmp->msg) 1486 if (tmp->msg)
1481 buf << "The item has a story:\n\n" << tmp->msg << "\n\n"; 1487 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1482 } 1488 }
1483 1489
1484 num_ident--; 1490 num_ident--;
1485 if (!num_ident) 1491 if (!num_ident)
1486 break; 1492 break;
… …
1498 { 1504 {
1499 identify (tmp); 1505 identify (tmp);
1500 1506
1501 if (object *pl = tmp->visible_to ()) 1507 if (object *pl = tmp->visible_to ())
1502 { 1508 {
1503 buf.printf ("On the ground you identified: %s.\n\n", long_desc (tmp, op)); 1509 buf.printf ("On the ground you identified: %s.\r", long_desc (tmp, op));
1504 1510
1505 if (tmp->msg) 1511 if (tmp->msg)
1506 buf << "The item has a story:\n\n" << tmp->msg << "\n\n"; 1512 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1507 } 1513 }
1508 1514
1509 num_ident--; 1515 num_ident--;
1510 if (!num_ident) 1516 if (!num_ident)
1511 break; 1517 break;
… …
1537 1543
1538 /* We precompute some values here so that we don't have to keep 1544 /* We precompute some values here so that we don't have to keep
1539 * doing it over and over again. 1545 * doing it over and over again.
1540 */ 1546 */
1541 god = find_god (determine_god (op)); 1547 god = find_god (determine_god (op));
1542 level = caster_level (caster, spell); 1548 level = casting_level (caster, spell);
1543 range = spell->range + SP_level_range_adjust (caster, spell); 1549 range = spell->range + SP_level_range_adjust (caster, spell);
1544 1550
1545 if (!skill) 1551 if (!skill)
1546 skill = caster; 1552 skill = caster;
1547 1553
… …
1631 /* Basically, if race is set in the spell, then the creatures race must 1637 /* Basically, if race is set in the spell, then the creatures race must
1632 * match that. if the spell race is set to GOD, then the gods opposing 1638 * match that. if the spell race is set to GOD, then the gods opposing
1633 * race must match. 1639 * race must match.
1634 */ 1640 */
1635 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && 1641 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1636 ((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) || 1642 ((spell->race == shstr_GOD && god && god->slaying && god->slaying.contains (tmp->race)) ||
1637 (strstr (spell->race, tmp->race)))) 1643 spell->race.contains (tmp->race)))
1638 { 1644 {
1639 done_one = 2; 1645 done_one = 2;
1640 if (!detect) 1646 if (!detect)
1641 detect = tmp; 1647 detect = tmp;
1642 } 1648 }
… …
1734 1740
1735 tmp->insert_at (victim); 1741 tmp->insert_at (victim);
1736 victim->stats.sp = 2 * victim->stats.maxsp; 1742 victim->stats.sp = 2 * victim->stats.maxsp;
1737 } 1743 }
1738 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 1744 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
1739 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 1745 new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode.");
1740 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 1746 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
1741 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 1747 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
1742 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 1748 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
1743 { 1749 {
1744 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 1750 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
… …
1790 } 1796 }
1791 /* give sp */ 1797 /* give sp */
1792 if (spell->stats.dam > 0) 1798 if (spell->stats.dam > 0)
1793 { 1799 {
1794 plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell); 1800 plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);
1795 charge_mana_effect (plyr, caster_level (caster, spell)); 1801 charge_mana_effect (plyr, casting_level (caster, spell));
1796 return 1; 1802 return 1;
1797 } 1803 }
1798 /* suck sp away. Can't suck sp from yourself */ 1804 /* suck sp away. Can't suck sp from yourself */
1799 else if (op != plyr) 1805 else if (op != plyr)
1800 { 1806 {
… …
1812 /* Player doesn't get full credit */ 1818 /* Player doesn't get full credit */
1813 sucked = (sucked * rate) / 100; 1819 sucked = (sucked * rate) / 100;
1814 op->stats.sp += sucked; 1820 op->stats.sp += sucked;
1815 if (sucked > 0) 1821 if (sucked > 0)
1816 { 1822 {
1817 charge_mana_effect (op, caster_level (caster, spell)); 1823 charge_mana_effect (op, casting_level (caster, spell));
1818 } 1824 }
1819 } 1825 }
1820 return 1; 1826 return 1;
1821 } 1827 }
1822 return 0; 1828 return 0;
… …
1919 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1925 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1920 break; 1926 break;
1921 if (tmp->type == HOLY_ALTAR) 1927 if (tmp->type == HOLY_ALTAR)
1922 { 1928 {
1923 1929
1924 if (tmp->level > caster_level (caster, spell)) 1930 if (tmp->level > casting_level (caster, spell))
1925 { 1931 {
1926 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name); 1932 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);
1927 return 0; 1933 return 0;
1928 } 1934 }
1929 else 1935 else
1930 { 1936 {
1931 /* If we got here, we are consecrating an altar */ 1937 /* If we got here, we are consecrating an altar */
1932 sprintf (buf, "Altar of %s", &god->name); 1938 sprintf (buf, "Altar of %s", &god->name);
1933 tmp->name = buf; 1939 tmp->name = buf;
1934 tmp->level = caster_level (caster, spell); 1940 tmp->level = casting_level (caster, spell);
1935 tmp->other_arch = god->arch; 1941 tmp->other_arch = god->arch;
1936 1942
1937 if (op->type == PLAYER) 1943 if (op->type == PLAYER)
1938 esrv_update_item (UPD_NAME, op, tmp); 1944 esrv_update_item (UPD_NAME, op, tmp);
1939 1945
… …
1982 return 0; 1988 return 0;
1983 } 1989 }
1984 1990
1985 /* if no direction specified, pick one */ 1991 /* if no direction specified, pick one */
1986 if (!dir) 1992 if (!dir)
1987 dir = find_free_spot (NULL, op->map, op->x, op->y, 1, 9); 1993 dir = find_free_spot (spell->other_arch, op->map, op->x, op->y, 1, 9);
1988 1994
1989 m = op->map; 1995 m = op->map;
1990 x = op->x + freearr_x[dir]; 1996 x = op->x + freearr_x[dir];
1991 y = op->y + freearr_y[dir]; 1997 y = op->y + freearr_y[dir];
1992 1998
1993 /* if there's no place to put the golem, abort */ 1999 /* if there's no place to put the golem, abort */
1994 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 2000 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
1995 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type)) 2001 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
1996 { 2002 {
1997 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2003 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1998 return 0; 2004 return 0;
1999 } 2005 }
2000 2006
… …
2004 if (!weapon) 2010 if (!weapon)
2005 { 2011 {
2006 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2012 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2007 return 0; 2013 return 0;
2008 } 2014 }
2015
2009 if (spell->race && strcmp (weapon->arch->archname, spell->race)) 2016 if (spell->race && weapon->arch->archname != spell->race)
2010 { 2017 {
2011 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2018 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2012 return 0; 2019 return 0;
2013 } 2020 }
2021
2014 if (weapon->type != WEAPON) 2022 if (weapon->type != WEAPON)
2015 { 2023 {
2016 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it."); 2024 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");
2017 return 0; 2025 return 0;
2018 } 2026 }
2027
2019 if (QUERY_FLAG (weapon, FLAG_APPLIED)) 2028 if (QUERY_FLAG (weapon, FLAG_APPLIED))
2020 { 2029 {
2021 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2030 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2022 return 0; 2031 return 0;
2023 } 2032 }
… …
2126 tmp->state = weapon->state; 2135 tmp->state = weapon->state;
2127 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE]; 2136 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2128 } 2137 }
2129 2138
2130 /* make experience increase in proportion to the strength of the summoned creature. */ 2139 /* make experience increase in proportion to the strength of the summoned creature. */
2131 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2140 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2132 2141
2133 tmp->speed_left = -1; 2142 tmp->speed_left = -1;
2134 tmp->direction = dir; 2143 tmp->direction = dir;
2135 2144
2136 m->insert (tmp, x, y, op); 2145 m->insert (tmp, x, y, op);
… …
2140/* cast_daylight() - changes the map darkness level *lower* */ 2149/* cast_daylight() - changes the map darkness level *lower* */
2141 2150
2142/* cast_change_map_lightlevel: Was cast_daylight/nightfall. 2151/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2143 * This changes the light level for the entire map. 2152 * This changes the light level for the entire map.
2144 */ 2153 */
2145
2146int 2154int
2147cast_change_map_lightlevel (object *op, object *caster, object *spell) 2155cast_change_map_lightlevel (object *op, object *caster, object *spell)
2148{ 2156{
2149 int success; 2157 int success;
2150 2158
… …
2158 if (spell->stats.dam < 0) 2166 if (spell->stats.dam < 0)
2159 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2167 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2160 else 2168 else
2161 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2169 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2162 } 2170 }
2171
2163 return success; 2172 return success;
2164} 2173}
2165 2174
2166/* create an aura spell object and put it in the player's inventory. 2175/* create an aura spell object and put it in the player's inventory.
2167 * as usual, op is player, caster is the object casting the spell, 2176 * as usual, op is player, caster is the object casting the spell,
… …
2184 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2193 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2185 2194
2186 set_spell_skill (op, caster, spell, new_aura); 2195 set_spell_skill (op, caster, spell, new_aura);
2187 new_aura->attacktype = spell->attacktype; 2196 new_aura->attacktype = spell->attacktype;
2188 2197
2189 new_aura->level = caster_level (caster, spell); 2198 new_aura->level = casting_level (caster, spell);
2190 2199
2191 if (refresh) 2200 if (refresh)
2192 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 2201 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2193 else 2202 else
2194 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 2203 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
… …
2265 * op is the piece object. 2274 * op is the piece object.
2266 */ 2275 */
2267void 2276void
2268move_peacemaker (object *op) 2277move_peacemaker (object *op)
2269{ 2278{
2270 object *tmp; 2279 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2271
2272 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2273 { 2280 {
2274 int atk_lev, def_lev; 2281 int atk_lev, def_lev;
2275 object *victim = tmp->head_ (); 2282 object *victim = tmp->head_ ();
2276 2283
2277 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2284 if (!QUERY_FLAG (victim, FLAG_MONSTER))
… …
2312 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2319 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2313 } 2320 }
2314 } 2321 }
2315} 2322}
2316 2323
2317
2318/* This writes a rune that contains the appropriate message. 2324/* This writes a rune that contains the appropriate message.
2319 * There really isn't any adjustments we make. 2325 * There really isn't any adjustments we make.
2320 */ 2326 */
2321
2322int 2327int
2323write_mark (object *op, object *spell, const char *msg) 2328write_mark (object *op, object *spell, const char *msg)
2324{ 2329{
2325 char rune[HUGE_BUF]; 2330 char rune[HUGE_BUF];
2326 object *tmp; 2331 object *tmp;

Diff Legend

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