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.86 by root, Fri Aug 29 06:47:16 2008 UTC vs.
Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC

… …
345 345
346 return 1; 346 return 1;
347 } 347 }
348 348
349 /* invis_race is set if we get here */ 349 /* invis_race is set if we get here */
350 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 350 if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
351 return 1; 351 return 1;
352 352
353 /* No race, can't be invisible to it */ 353 /* No race, can't be invisible to it */
354 if (!mon->race) 354 if (!mon->race)
355 return 0; 355 return 0;
356 356
357 if (strstr (mon->race, pl->contr->invis_race)) 357 if (mon->race.contains (pl->contr->invis_race))
358 return 1; 358 return 1;
359 359
360 /* Nothing matched above, return 0 */ 360 /* Nothing matched above, return 0 */
361 return 0; 361 return 0;
362 } 362 }
… …
573 573
574 dynbuf_text buf; 574 dynbuf_text buf;
575 575
576 if (player *pl = op->contr) 576 if (player *pl = op->contr)
577 if (object *race = archetype::find (op->race)) 577 if (object *race = archetype::find (op->race))
578 buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n"; 578 buf << " - You are a G<male|female> " << &race->name << ".\n";
579 579
580 if (object *god = find_god (determine_god (op))) 580 if (object *god = find_god (determine_god (op)))
581 buf << "You worship " << &god->name << ".\n"; 581 buf << " - You worship " << &god->name << ".\n";
582 else 582 else
583 buf << "You worship no god.\n"; 583 buf << " - You worship no god.\n";
584 584
585 object *tmp = present_arch_in_ob (at, op); 585 object *tmp = present_arch_in_ob (at, op);
586 586
587 if (*cp == '\0' && tmp == NULL) 587 if (*cp == '\0' && !tmp)
588 buf << "You feel very mundane. "; 588 buf << " - You feel very mundane. ";
589 else 589 else
590 { 590 {
591 buf << "You have: " << cp << ".\n"; 591 buf << " - You have: " << cp << ".\n";
592 592
593 if (tmp) 593 if (tmp)
594 for (int i = 0; i < NUM_STATS; i++) 594 for (int i = 0; i < NUM_STATS; i++)
595 if (tmp->stats.stat (i) < 0) 595 if (tmp->stats.stat (i) < 0)
596 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));
597 } 597 }
598 598
599 if (is_dragon_pl (op)) 599 if (is_dragon_pl (op))
600 /* now grab the 'dragon_ability'-force from the player's inventory */ 600 /* now grab the 'dragon_ability'-force from the player's inventory */
601 for (tmp = op->inv; tmp; tmp = tmp->below) 601 for (tmp = op->inv; tmp; tmp = tmp->below)
602 { 602 {
603 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force) 603 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
604 { 604 {
605 if (tmp->stats.exp == 0) 605 if (tmp->stats.exp == 0)
606 buf << "Your metabolism isn't focused on anything.\n"; 606 buf << " - Your metabolism isn't focused on anything.\n";
607 else 607 else
608 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";
609 609
610 break; 610 break;
611 } 611 }
612 } 612 }
613 613
… …
709 */ 709 */
710 if (tmp->type != EARTHWALL) //TODO 710 if (tmp->type != EARTHWALL) //TODO
711 tmp->set_owner (op); 711 tmp->set_owner (op);
712 712
713 set_spell_skill (op, caster, spell_ob, tmp); 713 set_spell_skill (op, caster, spell_ob, tmp);
714 tmp->level = caster_level (caster, spell_ob) / 2; 714 tmp->level = casting_level (caster, spell_ob) / 2;
715 715
716 name = tmp->name; 716 name = tmp->name;
717 if (!(tmp = m->insert (tmp, x, y, op))) 717 if (!(tmp = m->insert (tmp, x, y, op)))
718 { 718 {
719 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);
… …
1036}; 1036};
1037 1037
1038int 1038int
1039cast_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)
1040{ 1040{
1041 object *force = NULL; 1041 object *force = 0;
1042 int i; 1042 int i;
1043 1043
1044 /* 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. */
1045 object *tmp = dir 1045 object *tmp = dir
1046 ? find_target_for_friendly_spell (op, dir) 1046 ? find_target_for_friendly_spell (op, dir)
1047 : op; 1047 : op;
1048 1048
1049 if (!tmp) 1049 if (!tmp)
1050 return 0; 1050 return 0;
1051 1051
1052 /* 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. */
… …
1061 } 1061 }
1062 else if (spell_ob->race && spell_ob->race == tmp2->name) 1062 else if (spell_ob->race && spell_ob->race == tmp2->name)
1063 { 1063 {
1064 if (!silent) 1064 if (!silent)
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); 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
1066 return 0; 1067 return 0;
1067 } 1068 }
1068 } 1069 }
1069 } 1070 }
1070 if (force == NULL) 1071
1072 if (!force)
1071 { 1073 {
1072 force = get_archetype (FORCE_NAME); 1074 force = get_archetype (FORCE_NAME);
1073 force->subtype = FORCE_CHANGE_ABILITY; 1075 force->subtype = FORCE_CHANGE_ABILITY;
1076
1074 if (spell_ob->race) 1077 if (spell_ob->race)
1075 force->name = spell_ob->race; 1078 force->name = spell_ob->race;
1076 else 1079 else
1077 force->name = spell_ob->name; 1080 force->name = spell_ob->name;
1081
1078 force->name_pl = spell_ob->name; 1082 force->name_pl = spell_ob->name;
1079 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.");
1080 1084
1081 } 1085 }
1082 else 1086 else
… …
1088 { 1092 {
1089 force->duration = duration; 1093 force->duration = duration;
1090 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.");
1091 } 1095 }
1092 else 1096 else
1093 {
1094 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.");
1095 }
1096 1098
1097 return 1; 1099 return 1;
1098 } 1100 }
1099 1101
1100 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;
… …
1426 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1428 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1427 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1429 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1428 { 1430 {
1429 was_one++; 1431 was_one++;
1430 1432
1431 if (tmp->level <= caster_level (caster, spell)) 1433 if (tmp->level <= casting_level (caster, spell))
1432 { 1434 {
1433 success++; 1435 success++;
1434 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1436 if (QUERY_FLAG (spell, FLAG_DAMNED))
1435 CLEAR_FLAG (tmp, FLAG_DAMNED); 1437 CLEAR_FLAG (tmp, FLAG_DAMNED);
1436 1438
… …
1477 { 1479 {
1478 identify (tmp); 1480 identify (tmp);
1479 1481
1480 if (op->type == PLAYER) 1482 if (op->type == PLAYER)
1481 { 1483 {
1482 buf.printf ("You identified: %s.\n\n", long_desc (tmp, op)); 1484 buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1483 1485
1484 if (tmp->msg) 1486 if (tmp->msg)
1485 buf << "The item has a story:\n\n" << tmp->msg << "\n\n"; 1487 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1486 } 1488 }
1487 1489
1488 num_ident--; 1490 num_ident--;
1489 if (!num_ident) 1491 if (!num_ident)
1490 break; 1492 break;
… …
1502 { 1504 {
1503 identify (tmp); 1505 identify (tmp);
1504 1506
1505 if (object *pl = tmp->visible_to ()) 1507 if (object *pl = tmp->visible_to ())
1506 { 1508 {
1507 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));
1508 1510
1509 if (tmp->msg) 1511 if (tmp->msg)
1510 buf << "The item has a story:\n\n" << tmp->msg << "\n\n"; 1512 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1511 } 1513 }
1512 1514
1513 num_ident--; 1515 num_ident--;
1514 if (!num_ident) 1516 if (!num_ident)
1515 break; 1517 break;
… …
1541 1543
1542 /* 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
1543 * doing it over and over again. 1545 * doing it over and over again.
1544 */ 1546 */
1545 god = find_god (determine_god (op)); 1547 god = find_god (determine_god (op));
1546 level = caster_level (caster, spell); 1548 level = casting_level (caster, spell);
1547 range = spell->range + SP_level_range_adjust (caster, spell); 1549 range = spell->range + SP_level_range_adjust (caster, spell);
1548 1550
1549 if (!skill) 1551 if (!skill)
1550 skill = caster; 1552 skill = caster;
1551 1553
1552 for (x = op->x - range; x <= op->x + range; x++) 1554 unordered_mapwalk (op, -range, -range, range, range)
1553 for (y = op->y - range; y <= op->y + range; y++)
1554 { 1555 {
1555 m = op->map;
1556 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1557 if (mflags & P_OUT_OF_MAP)
1558 continue;
1559
1560 /* For most of the detections, we only detect objects above the 1556 /* For most of the detections, we only detect objects above the
1561 * floor. But this is not true for show invisible. 1557 * floor. But this is not true for show invisible.
1562 * Basically, we just go and find the top object and work 1558 * Basically, we just go and find the top object and work
1563 * down - that is easier than working up. 1559 * down - that is easier than working up.
1564 */ 1560 */
1565 1561
1566 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above) 1562 for (last = NULL, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1567 last = tmp; 1563 last = tmp;
1568 1564
1569 /* Shouldn't happen, but if there are no objects on a space, this 1565 /* Shouldn't happen, but if there are no objects on a space, this
1570 * would happen. 1566 * would happen.
1571 */ 1567 */
1572 if (!last) 1568 if (!last)
1573 continue; 1569 continue;
1574 1570
1575 done_one = 0; 1571 done_one = 0;
1576 floor = 0; 1572 floor = 0;
1577 detect = NULL; 1573 detect = NULL;
1578 for (tmp = last; tmp; tmp = tmp->below) 1574 for (tmp = last; tmp; tmp = tmp->below)
1579 { 1575 {
1580 /* show invisible */ 1576 /* show invisible */
1581 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1577 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1582 /* Might there be other objects that we can make visible? */ 1578 /* Might there be other objects that we can make visible? */
1583 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) || 1579 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||
1584 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) || 1580 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ))
1585 tmp->type == CF_HANDLE || 1581 || tmp->type == CF_HANDLE
1586 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE || 1582 || tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE
1587 tmp->type == BUTTON || tmp->type == TELEPORTER || 1583 || tmp->type == BUTTON || tmp->type == TELEPORTER
1588 tmp->type == GATE || tmp->type == LOCKED_DOOR || 1584 || tmp->type == GATE || tmp->type == LOCKED_DOOR
1589 tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN || 1585 || tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN
1590 tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY || 1586 || tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY
1591 tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR))) 1587 || tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR)))
1592 { 1588 {
1593 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4) 1589 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1594 { 1590 {
1595 tmp->invisible = 0; 1591 tmp->invisible = 0;
1596 done_one = 1; 1592 done_one = 1;
1597 } 1593 }
1598 } 1594 }
1599 1595
1600 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1596 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1601 floor = 1; 1597 floor = 1;
1602 1598
1603 /* All detections below this point don't descend beneath the floor, 1599 /* All detections below this point don't descend beneath the floor,
1604 * so just continue on. We could be clever and look at the type of 1600 * so just continue on. We could be clever and look at the type of
1605 * detection to completely break out if we don't care about objects beneath 1601 * detection to completely break out if we don't care about objects beneath
1606 * the floor, but once we get to the floor, not likely a very big issue anyways. 1602 * the floor, but once we get to the floor, not likely a very big issue anyways.
1607 */ 1603 */
1608 if (floor) 1604 if (floor)
1609 continue; 1605 continue;
1610 1606
1611 /* I had thought about making detect magic and detect curse 1607 /* I had thought about making detect magic and detect curse
1612 * show the flash the magic item like it does for detect monster. 1608 * show the flash the magic item like it does for detect monster.
1613 * however, if the object is within sight, this would then make it 1609 * however, if the object is within sight, this would then make it
1614 * difficult to see what object is magical/cursed, so the 1610 * difficult to see what object is magical/cursed, so the
1615 * effect wouldn't be as apparant. 1611 * effect wouldn't be as apparent.
1616 */ 1612 */
1617 1613
1618 /* detect magic */ 1614 /* detect magic */
1619 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && 1615 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&
1620 !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp)) 1616 !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp))
1621 { 1617 {
1622 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1618 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1623 /* make runes more visibile */ 1619 /* make runes more visibile */
1624 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC) 1620 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1625 tmp->stats.Cha /= 4; 1621 tmp->stats.Cha /= 4;
1622
1626 done_one = 1; 1623 done_one = 1;
1627 } 1624 }
1625
1628 /* detect monster */ 1626 /* detect monster */
1629 if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER)) 1627 if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER))
1630 { 1628 {
1631 done_one = 2; 1629 done_one = 2;
1630
1632 if (!detect) 1631 if (!detect)
1633 detect = tmp; 1632 detect = tmp;
1634 } 1633 }
1634
1635 /* Basically, if race is set in the spell, then the creatures race must 1635 /* Basically, if race is set in the spell, then the creatures race must
1636 * match that. if the spell race is set to GOD, then the gods opposing 1636 * match that. if the spell race is set to GOD, then the gods opposing
1637 * race must match. 1637 * race must match.
1638 */ 1638 */
1639 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && 1639 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1640 ((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) || 1640 ((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
1641 (strstr (spell->race, tmp->race)))) 1641 spell->race.contains (tmp->race)))
1642 { 1642 {
1643 done_one = 2; 1643 done_one = 2;
1644
1644 if (!detect) 1645 if (!detect)
1645 detect = tmp; 1646 detect = tmp;
1646 } 1647 }
1648
1647 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1649 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1648 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1650 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1649 { 1651 {
1650 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1652 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1651 done_one = 1; 1653 done_one = 1;
1652 } 1654 }
1653 } /* for stack of objects on this space */ 1655 } /* for stack of objects on this space */
1654 1656
1655 /* Code here puts an effect of the spell on the space, so you can see 1657 /* Code here puts an effect of the spell on the space, so you can see
1656 * where the magic is. 1658 * where the magic is.
1657 */ 1659 */
1658 if (done_one) 1660 if (done_one)
1659 { 1661 {
1660 object *detect_ob = arch_to_object (spell->other_arch); 1662 object *detect_ob = arch_to_object (spell->other_arch);
1661 1663
1662 /* if this is set, we want to copy the face */ 1664 /* if this is set, we want to copy the face */
1663 if (done_one == 2 && detect) 1665 if (done_one == 2 && detect)
1664 { 1666 {
1665 detect_ob->face = detect->face; 1667 detect_ob->face = detect->face;
1666 detect_ob->animation_id = detect->animation_id; 1668 detect_ob->animation_id = detect->animation_id;
1667 detect_ob->anim_speed = detect->anim_speed; 1669 detect_ob->anim_speed = detect->anim_speed;
1668 detect_ob->last_anim = 0; 1670 detect_ob->last_anim = 0;
1669 /* by default, the detect_ob is already animated */ 1671 /* by default, the detect_ob is already animated */
1670 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1672 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
1671 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1673 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
1672 } 1674 }
1673 1675
1674 m->insert (detect_ob, nx, ny, op); 1676 m->insert (detect_ob, nx, ny, op);
1675 } 1677 }
1676 } /* for processing the surrounding spaces */ 1678 } /* for processing the surrounding spaces */
1677 1679
1678 1680
1679 /* Now process objects in the players inventory if detect curse or magic */ 1681 /* Now process objects in the players inventory if detect curse or magic */
1680 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1682 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))
1681 { 1683 {
… …
1725 1727
1726 new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you."); 1728 new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");
1727 1729
1728 if (victim->stats.sp >= victim->stats.maxsp * 2) 1730 if (victim->stats.sp >= victim->stats.maxsp * 2)
1729 { 1731 {
1730 object *tmp;
1731
1732 new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!"); 1732 new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");
1733
1734 /* Explodes a fireball centered at player */
1735 tmp = get_archetype (EXPLODING_FIREBALL);
1736 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
1737 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
1738
1739 tmp->insert_at (victim);
1740 victim->stats.sp = 2 * victim->stats.maxsp; 1733 victim->stats.sp = 2 * victim->stats.maxsp;
1734 create_exploding_ball_at (victim, caster_level);
1741 } 1735 }
1742 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 1736 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
1743 new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode."); 1737 new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode.");
1744 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 1738 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
1745 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 1739 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
… …
1794 } 1788 }
1795 /* give sp */ 1789 /* give sp */
1796 if (spell->stats.dam > 0) 1790 if (spell->stats.dam > 0)
1797 { 1791 {
1798 plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell); 1792 plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);
1799 charge_mana_effect (plyr, caster_level (caster, spell)); 1793 charge_mana_effect (plyr, casting_level (caster, spell));
1800 return 1; 1794 return 1;
1801 } 1795 }
1802 /* suck sp away. Can't suck sp from yourself */ 1796 /* suck sp away. Can't suck sp from yourself */
1803 else if (op != plyr) 1797 else if (op != plyr)
1804 { 1798 {
… …
1816 /* Player doesn't get full credit */ 1810 /* Player doesn't get full credit */
1817 sucked = (sucked * rate) / 100; 1811 sucked = (sucked * rate) / 100;
1818 op->stats.sp += sucked; 1812 op->stats.sp += sucked;
1819 if (sucked > 0) 1813 if (sucked > 0)
1820 { 1814 {
1821 charge_mana_effect (op, caster_level (caster, spell)); 1815 charge_mana_effect (op, casting_level (caster, spell));
1822 } 1816 }
1823 } 1817 }
1824 return 1; 1818 return 1;
1825 } 1819 }
1826 return 0; 1820 return 0;
… …
1923 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1917 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1924 break; 1918 break;
1925 if (tmp->type == HOLY_ALTAR) 1919 if (tmp->type == HOLY_ALTAR)
1926 { 1920 {
1927 1921
1928 if (tmp->level > caster_level (caster, spell)) 1922 if (tmp->level > casting_level (caster, spell))
1929 { 1923 {
1930 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name); 1924 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);
1931 return 0; 1925 return 0;
1932 } 1926 }
1933 else 1927 else
1934 { 1928 {
1935 /* If we got here, we are consecrating an altar */ 1929 /* If we got here, we are consecrating an altar */
1936 sprintf (buf, "Altar of %s", &god->name); 1930 sprintf (buf, "Altar of %s", &god->name);
1937 tmp->name = buf; 1931 tmp->name = buf;
1938 tmp->level = caster_level (caster, spell); 1932 tmp->level = casting_level (caster, spell);
1939 tmp->other_arch = god->arch; 1933 tmp->other_arch = god->arch;
1940 1934
1941 if (op->type == PLAYER) 1935 if (op->type == PLAYER)
1942 esrv_update_item (UPD_NAME, op, tmp); 1936 esrv_update_item (UPD_NAME, op, tmp);
1943 1937
… …
2008 if (!weapon) 2002 if (!weapon)
2009 { 2003 {
2010 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2004 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2011 return 0; 2005 return 0;
2012 } 2006 }
2007
2013 if (spell->race && strcmp (weapon->arch->archname, spell->race)) 2008 if (spell->race && weapon->arch->archname != spell->race)
2014 { 2009 {
2015 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2010 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2016 return 0; 2011 return 0;
2017 } 2012 }
2013
2018 if (weapon->type != WEAPON) 2014 if (weapon->type != WEAPON)
2019 { 2015 {
2020 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it."); 2016 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");
2021 return 0; 2017 return 0;
2022 } 2018 }
2019
2023 if (QUERY_FLAG (weapon, FLAG_APPLIED)) 2020 if (QUERY_FLAG (weapon, FLAG_APPLIED))
2024 { 2021 {
2025 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2022 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2026 return 0; 2023 return 0;
2027 } 2024 }
… …
2130 tmp->state = weapon->state; 2127 tmp->state = weapon->state;
2131 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE]; 2128 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2132 } 2129 }
2133 2130
2134 /* make experience increase in proportion to the strength of the summoned creature. */ 2131 /* make experience increase in proportion to the strength of the summoned creature. */
2135 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2132 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2136 2133
2137 tmp->speed_left = -1; 2134 tmp->speed_left = -1;
2138 tmp->direction = dir; 2135 tmp->direction = dir;
2139 2136
2140 m->insert (tmp, x, y, op); 2137 m->insert (tmp, x, y, op);
… …
2144/* cast_daylight() - changes the map darkness level *lower* */ 2141/* cast_daylight() - changes the map darkness level *lower* */
2145 2142
2146/* cast_change_map_lightlevel: Was cast_daylight/nightfall. 2143/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2147 * This changes the light level for the entire map. 2144 * This changes the light level for the entire map.
2148 */ 2145 */
2149
2150int 2146int
2151cast_change_map_lightlevel (object *op, object *caster, object *spell) 2147cast_change_map_lightlevel (object *op, object *caster, object *spell)
2152{ 2148{
2153 int success; 2149 int success;
2154 2150
… …
2162 if (spell->stats.dam < 0) 2158 if (spell->stats.dam < 0)
2163 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2159 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2164 else 2160 else
2165 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2161 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2166 } 2162 }
2163
2167 return success; 2164 return success;
2168} 2165}
2169 2166
2170/* create an aura spell object and put it in the player's inventory. 2167/* create an aura spell object and put it in the player's inventory.
2171 * as usual, op is player, caster is the object casting the spell, 2168 * as usual, op is player, caster is the object casting the spell,
… …
2188 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2185 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2189 2186
2190 set_spell_skill (op, caster, spell, new_aura); 2187 set_spell_skill (op, caster, spell, new_aura);
2191 new_aura->attacktype = spell->attacktype; 2188 new_aura->attacktype = spell->attacktype;
2192 2189
2193 new_aura->level = caster_level (caster, spell); 2190 new_aura->level = casting_level (caster, spell);
2194 2191
2195 if (refresh) 2192 if (refresh)
2196 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 2193 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2197 else 2194 else
2198 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 2195 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
… …
2269 * op is the piece object. 2266 * op is the piece object.
2270 */ 2267 */
2271void 2268void
2272move_peacemaker (object *op) 2269move_peacemaker (object *op)
2273{ 2270{
2274 object *tmp; 2271 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2275
2276 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2277 { 2272 {
2278 int atk_lev, def_lev; 2273 int atk_lev, def_lev;
2279 object *victim = tmp->head_ (); 2274 object *victim = tmp->head_ ();
2280 2275
2281 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2276 if (!QUERY_FLAG (victim, FLAG_MONSTER))
… …
2316 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2311 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2317 } 2312 }
2318 } 2313 }
2319} 2314}
2320 2315
2321
2322/* This writes a rune that contains the appropriate message. 2316/* This writes a rune that contains the appropriate message.
2323 * There really isn't any adjustments we make. 2317 * There really isn't any adjustments we make.
2324 */ 2318 */
2325
2326int 2319int
2327write_mark (object *op, object *spell, const char *msg) 2320write_mark (object *op, object *spell, const char *msg)
2328{ 2321{
2329 char rune[HUGE_BUF];
2330 object *tmp;
2331
2332 if (!msg || msg[0] == 0) 2322 if (!msg || msg[0] == 0)
2333 { 2323 {
2334 new_draw_info (NDI_UNIQUE, 0, op, "Write what?"); 2324 new_draw_info (NDI_UNIQUE, 0, op, "Write what?");
2335 return 0; 2325 return 0;
2336 } 2326 }
… …
2339 { 2329 {
2340 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?"); 2330 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");
2341 LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg); 2331 LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg);
2342 return 0; 2332 return 0;
2343 } 2333 }
2334
2344 if (!spell->other_arch) 2335 if (!spell->other_arch)
2345 return 0; 2336 return 0;
2337
2346 tmp = arch_to_object (spell->other_arch); 2338 object *tmp = arch_to_object (spell->other_arch);
2347
2348 snprintf (rune, sizeof (rune), "%s\n", msg);
2349 2339
2350 tmp->race = op->name; /*Save the owner of the rune */ 2340 tmp->race = op->name; /*Save the owner of the rune */
2351 tmp->msg = rune; 2341 tmp->msg = msg;
2352 2342
2353 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR); 2343 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2344
2354 return 1; 2345 return 1;
2355} 2346}
2347

Diff Legend

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