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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.107 by root, Mon May 28 21:28:35 2007 UTC vs.
Revision 1.115 by root, Tue Jul 10 06:48:02 2007 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <cmath> 24#include <cmath>
… …
69 68
70 /* If the director has race set, only affect objects with a arch, 69 /* If the director has race set, only affect objects with a arch,
71 * name or race that matches. 70 * name or race that matches.
72 */ 71 */
73 if ((op->race) && 72 if ((op->race) &&
74 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
75 ((!(victim->name && name_flag) || op->race != victim->name)) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
76 ((!(victim->race && race_flag) || op->race != victim->race))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
77 return 1; 76 return 1;
78 77
79 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
80 * of arch, name, or race match. 79 * of arch, name, or race match.
81 */ 80 */
82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
83 ((victim->name && name_flag && op->slaying == victim->name)) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
84 ((victim->race && race_flag && op->slaying == victim->race))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
85 return 1; 84 return 1;
86 85
87 return 0; 86 return 0;
… …
425 return 0; 424 return 0;
426 425
427 op = op->below; 426 op = op->below;
428 while (op != NULL) 427 while (op != NULL)
429 { 428 {
430 if (strcmp (op->arch->name, item) == 0) 429 if (strcmp (op->arch->archname, item) == 0)
431 { 430 {
432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 431 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 432 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
434 { 433 {
435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 434 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
… …
459 prev = op; 458 prev = op;
460 op = op->below; 459 op = op->below;
461 460
462 while (op != NULL) 461 while (op != NULL)
463 { 462 {
464 if (strcmp (op->arch->name, item) == 0) 463 if (strcmp (op->arch->archname, item) == 0)
465 { 464 {
466 if (op->nrof >= nrof) 465 if (op->nrof >= nrof)
467 { 466 {
468 decrease_ob_nr (op, nrof); 467 decrease_ob_nr (op, nrof);
469 return; 468 return;
… …
576 op->update_stats (); 575 op->update_stats ();
577 return 1; 576 return 1;
578} 577}
579 578
580/* Types of improvements, hidden in the sp field. */ 579/* Types of improvements, hidden in the sp field. */
581#define IMPROVE_PREPARE 1 580#define IMPROVE_PREPARE 1
582#define IMPROVE_DAMAGE 2 581#define IMPROVE_DAMAGE 2
583#define IMPROVE_WEIGHT 3 582#define IMPROVE_WEIGHT 3
584#define IMPROVE_ENCHANT 4 583#define IMPROVE_ENCHANT 4
585#define IMPROVE_STR 5 584#define IMPROVE_STR 5
586#define IMPROVE_DEX 6 585#define IMPROVE_DEX 6
587#define IMPROVE_CON 7 586#define IMPROVE_CON 7
588#define IMPROVE_WIS 8 587#define IMPROVE_WIS 8
589#define IMPROVE_CHA 9 588#define IMPROVE_CHA 9
590#define IMPROVE_INT 10 589#define IMPROVE_INT 10
591#define IMPROVE_POW 11 590#define IMPROVE_POW 11
592
593 591
594/** 592/**
595 * This does the prepare weapon scroll. 593 * This does the prepare weapon scroll.
596 * Checks for sacrifice, and so on. 594 * Checks for sacrifice, and so on.
597 */ 595 */
598
599int 596int
600prepare_weapon (object *op, object *improver, object *weapon) 597prepare_weapon (object *op, object *improver, object *weapon)
601{ 598{
602 int sacrifice_count, i; 599 int sacrifice_count, i;
603 char buf[MAX_BUF]; 600 char buf[MAX_BUF];
… …
605 if (weapon->level != 0) 602 if (weapon->level != 0)
606 { 603 {
607 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 604 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared.");
608 return 0; 605 return 0;
609 } 606 }
607
610 for (i = 0; i < NROFATTACKS; i++) 608 for (i = 0; i < NROFATTACKS; i++)
611 if (weapon->resist[i]) 609 if (weapon->resist[i])
612 break; 610 break;
613 611
614 /* If we break out, i will be less than nrofattacks, preventing 612 /* If we break out, i will be less than nrofattacks, preventing
… …
620 weapon->stats.ac) /* AC - only taifu's I think */ 618 weapon->stats.ac) /* AC - only taifu's I think */
621 { 619 {
622 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 620 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons.");
623 return 0; 621 return 0;
624 } 622 }
623
625 sacrifice_count = check_sacrifice (op, improver); 624 sacrifice_count = check_sacrifice (op, improver);
626 if (sacrifice_count <= 0) 625 if (sacrifice_count <= 0)
627 return 0; 626 return 0;
627
628 weapon->level = isqrt (sacrifice_count); 628 weapon->level = isqrt (sacrifice_count);
629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted."); 629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
630 eat_item (op, improver->slaying, sacrifice_count); 630 eat_item (op, improver->slaying, sacrifice_count);
631 631
632 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 632 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level);
… …
855 { 855 {
856 base = base - (base * settings.armor_speed_improvement) / 100; 856 base = base - (base * settings.armor_speed_improvement) / 100;
857 pow++; 857 pow++;
858 } 858 }
859 859
860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
861 } 861 }
862 else 862 else
863 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 863 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
864 864
865 if (!settings.armor_weight_linear) 865 if (!settings.armor_weight_linear)
866 { 866 {
867 int base = 100; 867 int base = 100;
868 int pow = 0; 868 int pow = 0;
… …
871 { 871 {
872 base = base - (base * settings.armor_weight_reduction) / 100; 872 base = base - (base * settings.armor_weight_reduction) / 100;
873 pow++; 873 pow++;
874 } 874 }
875 875
876 armour->weight = (armour->arch->clone.weight * base) / 100; 876 armour->weight = (armour->arch->weight * base) / 100;
877 } 877 }
878 else 878 else
879 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 879 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
880 880
881 if (armour->weight <= 0) 881 if (armour->weight <= 0)
882 { 882 {
883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
884 armour->weight = 1; 884 armour->weight = 1;
885 } 885 }
886 886
887 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 887 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
888 888
889 if (op->type == PLAYER) 889 if (op->type == PLAYER)
890 { 890 {
891 esrv_send_item (op, armour); 891 esrv_send_item (op, armour);
892 if (QUERY_FLAG (armour, FLAG_APPLIED)) 892 if (QUERY_FLAG (armour, FLAG_APPLIED))
… …
944 944
945 price_in = cost * item->value; 945 price_in = cost * item->value;
946 } 946 }
947 else 947 else
948 { 948 {
949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
951 return 0; 951 return 0;
952 952
953 if (CONV_NEED (converter)) 953 if (CONV_NEED (converter))
954 { 954 {
… …
1245 */ 1245 */
1246static void 1246static void
1247apply_sign (object *op, object *sign, int autoapply) 1247apply_sign (object *op, object *sign, int autoapply)
1248{ 1248{
1249 readable_message_type *msgType; 1249 readable_message_type *msgType;
1250 char newbuf[HUGE_BUF];
1251 1250
1252 if (sign->msg == NULL) 1251 if (sign->msg == NULL)
1253 { 1252 {
1254 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1253 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");
1255 return; 1254 return;
… …
1276 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1275 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1277 { 1276 {
1278 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1277 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1279 return; 1278 return;
1280 } 1279 }
1280
1281 if (op->contr)
1282 if (client *ns = op->contr->ns)
1283 {
1281 msgType = get_readable_message_type (sign); 1284 msgType = get_readable_message_type (sign);
1285
1286 if (ns->can_msg)
1287 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
1288 else
1289 {
1290 char newbuf[HUGE_BUF];
1282 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1291 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1283 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1292 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1293 }
1294 }
1284} 1295}
1285 1296
1286/** 1297/**
1287 * 'victim' moves onto 'trap' 1298 * 'victim' moves onto 'trap'
1288 * 'victim' leaves 'trap' 1299 * 'victim' leaves 'trap'
… …
1311 * proper. This code was causing needless crashes. 1322 * proper. This code was causing needless crashes.
1312 */ 1323 */
1313 if (recursion_depth >= 500) 1324 if (recursion_depth >= 500)
1314 { 1325 {
1315 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1326 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1316 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1327 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1317 return; 1328 return;
1318 } 1329 }
1330
1319 recursion_depth++; 1331 recursion_depth++;
1320 if (trap->head) 1332 if (trap->head)
1321 trap = trap->head; 1333 trap = trap->head;
1322 1334
1323 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1335 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1518 } 1530 }
1519 goto leave; 1531 goto leave;
1520 1532
1521 default: 1533 default:
1522 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1534 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1523 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1535 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1524 goto leave; 1536 goto leave;
1525 } 1537 }
1526 1538
1527leave: 1539leave:
1528 recursion_depth--; 1540 recursion_depth--;
… …
1540 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1552 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1541 { 1553 {
1542 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1554 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1543 return; 1555 return;
1544 } 1556 }
1557
1545 if (tmp->msg == NULL) 1558 if (!tmp->msg)
1546 { 1559 {
1547 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1560 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);
1548 return; 1561 return;
1549 } 1562 }
1550 1563
1551 /* need a literacy skill to read stuff! */ 1564 /* need a literacy skill to read stuff! */
1552 skill_ob = find_skill_by_name (op, tmp->skill); 1565 skill_ob = find_skill_by_name (op, tmp->skill);
1553 if (!skill_ob) 1566 if (!skill_ob)
1554 { 1567 {
1555 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1568 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the skill to read this>");
1556 return; 1569 return;
1557 } 1570 }
1571
1558 lev_diff = tmp->level - (skill_ob->level + 5); 1572 lev_diff = tmp->level - (skill_ob->level + 5);
1559 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1573 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1560 { 1574 {
1561 if (lev_diff < 2) 1575 if (lev_diff < 2)
1562 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1576 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");
… …
1573 return; 1587 return;
1574 } 1588 }
1575 1589
1576 readable_message_type *msgType = get_readable_message_type (tmp); 1590 readable_message_type *msgType = get_readable_message_type (tmp);
1577 1591
1592 if (player *pl = op->contr)
1593 if (client *ns = pl->ns)
1594 if (ns->can_msg)
1595 {
1596 dynbuf_text buf;
1597 buf << long_desc (tmp, op)
1598 << "\n\n"
1599 << tmp->msg
1600 << '\0';
1601 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1602 }
1603 else
1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1604 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1579 msgType->message_type, msgType->message_subtype, 1605 msgType->message_type, msgType->message_subtype,
1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1606 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581 long_desc (tmp, op), &tmp->msg); 1607 long_desc (tmp, op), &tmp->msg);
1582 1608
1583 /* gain xp from reading */ 1609 /* gain xp from reading */
1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1610 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1585 { /* only if not read before */ 1611 { /* only if not read before */
1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1612 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1707 1733
1708 /* artifact_spellbooks have 'slaying' field point to a spell name, 1734 /* artifact_spellbooks have 'slaying' field point to a spell name,
1709 * instead of having their spell stored in stats.sp. These are 1735 * instead of having their spell stored in stats.sp. These are
1710 * legacy spellbooks 1736 * legacy spellbooks
1711 */ 1737 */
1712
1713 if (tmp->slaying != NULL) 1738 if (tmp->slaying)
1714 { 1739 {
1715 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1740 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1716 if (!spell) 1741 if (!spell)
1717 { 1742 {
1718 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1743 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);
1719 return; 1744 return;
1720 } 1745 }
1721 else 1746 else
1722 insert_ob_in_ob (spell, tmp); 1747 insert_ob_in_ob (spell, tmp);
1748
1723 tmp->slaying = NULL; 1749 tmp->slaying = 0;
1724 } 1750 }
1725 1751
1726 skop = find_skill_by_name (op, tmp->skill); 1752 skop = find_skill_by_name (op, tmp->skill);
1727 1753
1728 /* need a literacy skill to learn spells. Also, having a literacy level 1754 /* need a literacy skill to learn spells. Also, having a literacy level
1729 * lower than the spell will make learning the spell more difficult */ 1755 * lower than the spell will make learning the spell more difficult */
1730 if (!skop) 1756 if (!skop)
1731 { 1757 {
1732 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1758 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails. H<You lack the literacy skill.>");
1733 return; 1759 return;
1734 } 1760 }
1735 1761
1736 spell = tmp->inv; 1762 spell = tmp->inv;
1737 1763
1738 if (!spell) 1764 if (!spell)
1739 { 1765 {
1740 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1766 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1741 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1767 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense. This is a bug, please report!");
1742 return; 1768 return;
1743 } 1769 }
1744 1770
1745 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1771 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1746 { 1772 {
1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]"); 1773 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<Your literacy level is too low.>");
1748 return; 1774 return;
1749 } 1775 }
1750 1776
1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1752 1778
… …
1765 * if the player doesn't know the spell, doesn't make a lot of sense that 1791 * if the player doesn't know the spell, doesn't make a lot of sense that
1766 * they would have a special prayer mark. 1792 * they would have a special prayer mark.
1767 */ 1793 */
1768 if (check_spell_known (op, spell->name)) 1794 if (check_spell_known (op, spell->name))
1769 { 1795 {
1770 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1796 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell. H<It makes no sense to leanr spells twice, and would only waste the spellbook.>\n");
1771 return; 1797 return;
1772 } 1798 }
1773 1799
1774 if (spell->skill) 1800 if (spell->skill)
1775 { 1801 {
… …
1817 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1843 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1818 } 1844 }
1819 else 1845 else
1820 { 1846 {
1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1847 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1848 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1823 } 1849 }
1824 1850
1825 decrease_ob (tmp); 1851 decrease_ob (tmp);
1826} 1852}
1827 1853
… …
1839 return; 1865 return;
1840 } 1866 }
1841 1867
1842 if (!tmp->inv || tmp->inv->type != SPELL) 1868 if (!tmp->inv || tmp->inv->type != SPELL)
1843 { 1869 {
1844 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1870 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense! H<...and never will make sense.>");
1845 return; 1871 return;
1846 } 1872 }
1847 1873
1848 if (op->type == PLAYER) 1874 if (op->type == PLAYER)
1849 { 1875 {
… …
1855 */ 1881 */
1856 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1882 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1857 1883
1858 if (!skop) 1884 if (!skop)
1859 { 1885 {
1860 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1886 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the literacy skill.>");
1861 return; 1887 return;
1862 } 1888 }
1863 1889
1864 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1890 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1865 change_exp (op, exp_gain, skop->skill, 0); 1891 change_exp (op, exp_gain, skop->skill, 0);
… …
1986 /* special food hack -b.t. */ 2012 /* special food hack -b.t. */
1987 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2013 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
1988 eat_special_food (op, tmp); 2014 eat_special_food (op, tmp);
1989 } 2015 }
1990 } 2016 }
2017
1991 handle_apply_yield (tmp); 2018 handle_apply_yield (tmp);
1992 decrease_ob (tmp); 2019 decrease_ob (tmp);
1993} 2020}
1994 2021
1995/** 2022/**
… …
2022 if (meal->type != FLESH || !is_dragon_pl (op)) 2049 if (meal->type != FLESH || !is_dragon_pl (op))
2023 return 0; 2050 return 0;
2024 2051
2025 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2052 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2026 from the player's inventory */ 2053 from the player's inventory */
2027 shstr_cmp dragon_ability_force ("dragon_ability_force");
2028 shstr_cmp dragon_skin_force ("dragon_skin_force");
2029
2030 for (tmp = op->inv; tmp; tmp = tmp->below) 2054 for (tmp = op->inv; tmp; tmp = tmp->below)
2031 if (tmp->type == FORCE) 2055 if (tmp->type == FORCE)
2032 if (tmp->arch->name == dragon_skin_force) 2056 if (tmp->arch->archname == shstr_dragon_skin_force)
2033 skin = tmp; 2057 skin = tmp;
2034 else if (tmp->arch->name == dragon_ability_force) 2058 else if (tmp->arch->archname == shstr_dragon_ability_force)
2035 abil = tmp; 2059 abil = tmp;
2036 2060
2037 /* if either skin or ability are missing, this is an old player 2061 /* if either skin or ability are missing, this is an old player
2038 which is not to be considered a dragon -> bail out */ 2062 which is not to be considered a dragon -> bail out */
2039 if (skin == NULL || abil == NULL) 2063 if (skin == NULL || abil == NULL)
… …
2160static void 2184static void
2161apply_armour_improver (object *op, object *tmp) 2185apply_armour_improver (object *op, object *tmp)
2162{ 2186{
2163 object *armor; 2187 object *armor;
2164 2188
2165 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2189 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2166 { 2190 {
2167 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2191 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll. H<The area prevents magic effects.>");
2168 return; 2192 return;
2169 } 2193 }
2170 2194
2171 armor = find_marked_object (op); 2195 armor = find_marked_object (op);
2172 2196
2173 if (!armor) 2197 if (!armor)
2174 { 2198 {
2175 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2199 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2176 return; 2200 return;
2177 } 2201 }
2178 2202
2179 if (armor->type != ARMOUR 2203 if (armor->type != ARMOUR
2180 && armor->type != CLOAK 2204 && armor->type != CLOAK
… …
2195 { 2219 {
2196 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2220 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0);
2197 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2221 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");
2198 strcpy (op->contr->killer, "poisonous booze"); 2222 strcpy (op->contr->killer, "poisonous booze");
2199 } 2223 }
2224
2200 if (tmp->stats.hp > 0) 2225 if (tmp->stats.hp > 0)
2201 { 2226 {
2202 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2227 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2203 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2228 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2204 } 2229 }
2230
2205 op->stats.food -= op->stats.food / 4; 2231 op->stats.food -= op->stats.food / 4;
2206 handle_apply_yield (tmp); 2232 handle_apply_yield (tmp);
2207 decrease_ob (tmp); 2233 decrease_ob (tmp);
2208} 2234}
2209 2235
… …
2319 2345
2320 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2346 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2321 { 2347 {
2322 if (op->type == PLAYER) 2348 if (op->type == PLAYER)
2323 { 2349 {
2324 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2350 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first. H<You cannot use items marked as unpaid.>");
2325 return 1; 2351 return 1;
2326 } 2352 }
2327 else 2353 else
2328 return 0; /* monsters just skip unpaid items */ 2354 return 0; /* monsters just skip unpaid items */
2329 } 2355 }
… …
2537int 2563int
2538player_apply (object *pl, object *op, int aflag, int quiet) 2564player_apply (object *pl, object *op, int aflag, int quiet)
2539{ 2565{
2540 int tmp; 2566 int tmp;
2541 2567
2542 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2568 if (op->env && (pl->move_type & MOVE_FLYING))
2543 { 2569 {
2544 /* player is flying and applying object not in inventory */ 2570 /* player is flying and applying object not in inventory */
2545 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2571 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2546 { 2572 {
2547 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2573 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2548 return 0; 2574 return 0;
2549 } 2575 }
2550 } 2576 }
2551 2577
2552 pl->contr->last_used = op; 2578 pl->contr->last_used = op;
… …
2557 if (tmp == 0) 2583 if (tmp == 0)
2558 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2584 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));
2559 else if (tmp == 2) 2585 else if (tmp == 2)
2560 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2586 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");
2561 } 2587 }
2588
2562 return tmp; 2589 return tmp;
2563} 2590}
2564 2591
2565/** 2592/**
2566 * player_apply_below attempts to apply the object 'below' the player. 2593 * player_apply_below attempts to apply the object 'below' the player.
… …
2806 * Returns 0 on success, returns 1 if there is some problem. 2833 * Returns 0 on success, returns 1 if there is some problem.
2807 * if aflags is AP_PRINT, we instead print out waht to unapply 2834 * if aflags is AP_PRINT, we instead print out waht to unapply
2808 * instead of doing it. This is a lot less code than having 2835 * instead of doing it. This is a lot less code than having
2809 * another function that does just that. 2836 * another function that does just that.
2810 */ 2837 */
2838
2839#define CANNOT_REMOVE_CURSED \
2840 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2841 "Praying over an altar, scrolls of remove curse/damnation, " \
2842 "priests or even other players might help.>"
2843
2811int 2844int
2812unapply_for_ob (object *who, object *op, int aflags) 2845unapply_for_ob (object *who, object *op, int aflags)
2813{ 2846{
2814 if (op->is_range ()) 2847 if (op->is_range ())
2815 for (object *tmp = who->inv; tmp; tmp = tmp->below) 2848 for (object *tmp = who->inv; tmp; tmp = tmp->below)
… …
2825 { 2858 {
2826 /* In this case, we want to try and remove a cursed item. 2859 /* In this case, we want to try and remove a cursed item.
2827 * While we know it won't work, we want unapply_special to 2860 * While we know it won't work, we want unapply_special to
2828 * at least generate the message. 2861 * at least generate the message.
2829 */ 2862 */
2830 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp)); 2863 new_draw_info_format (NDI_UNIQUE, 0, who,
2864 "No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
2865 query_name (tmp));
2831 return 1; 2866 return 1;
2832 } 2867 }
2833 2868
2834 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 2869 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2835 { 2870 {
… …
2869 /* Cursed item that we can't unequip - tell the player. 2904 /* Cursed item that we can't unequip - tell the player.
2870 * Note this could be annoying if this is just one of a few, 2905 * Note this could be annoying if this is just one of a few,
2871 * so it may not be critical (eg, putting on a ring and you have 2906 * so it may not be critical (eg, putting on a ring and you have
2872 * one cursed ring.) 2907 * one cursed ring.)
2873 */ 2908 */
2874 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2909 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp));
2875 } 2910 }
2876 2911
2877 last = tmp->below; 2912 last = tmp->below;
2878 } 2913 }
2879 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2914 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
… …
3032 * 3067 *
3033 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3068 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3034 * 3069 *
3035 * apply_special() doesn't check for unpaid items. 3070 * apply_special() doesn't check for unpaid items.
3036 */ 3071 */
3072
3073#define LACK_ITEM_POWER \
3074 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3075
3037int 3076int
3038apply_special (object *who, object *op, int aflags) 3077apply_special (object *who, object *op, int aflags)
3039{ 3078{
3040 int basic_flag = aflags & AP_BASIC_FLAGS; 3079 int basic_flag = aflags & AP_BASIC_FLAGS;
3041 object *tmp, *tmp2, *skop = NULL; 3080 object *tmp, *tmp2, *skop = NULL;
… …
3056 if (basic_flag == AP_APPLY) 3095 if (basic_flag == AP_APPLY)
3057 return 0; 3096 return 0;
3058 3097
3059 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3098 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3060 { 3099 {
3061 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op)); 3100 new_draw_info_format (NDI_UNIQUE, 0, who,
3101 "No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
3102 query_name (op));
3062 return 1; 3103 return 1;
3063 } 3104 }
3064 3105
3065 return unapply_special (who, op, aflags); 3106 return unapply_special (who, op, aflags);
3066 } 3107 }
… …
3082 /* Can't just apply this object. Lets see what not and what to do */ 3123 /* Can't just apply this object. Lets see what not and what to do */
3083 if (int i = can_apply_object (who, op)) 3124 if (int i = can_apply_object (who, op))
3084 { 3125 {
3085 if (i & CAN_APPLY_NEVER) 3126 if (i & CAN_APPLY_NEVER)
3086 { 3127 {
3087 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3128 new_draw_info_format (NDI_UNIQUE, 0, who,
3129 "You don't have the body to use a %s. H<You can never apply this item.>",
3130 query_name (op));
3088 return 1; 3131 return 1;
3089 } 3132 }
3090 else if (i & CAN_APPLY_RESTRICTION) 3133 else if (i & CAN_APPLY_RESTRICTION)
3091 { 3134 {
3092 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3135 new_draw_info_format (NDI_UNIQUE, 0, who,
3136 "You have a prohibition against using a %s. "
3137 "H<Your belief, profession or class prevents you from applying this item.>",
3138 query_name (op));
3093 return 1; 3139 return 1;
3094 } 3140 }
3095 3141
3096 if (who->type != PLAYER) 3142 if (who->type != PLAYER)
3097 { 3143 {
… …
3132 if (who->type == PLAYER 3178 if (who->type == PLAYER
3133 && op->item_power 3179 && op->item_power
3134 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level) 3180 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3135 { 3181 {
3136 new_draw_info (NDI_UNIQUE, 0, who, 3182 new_draw_info (NDI_UNIQUE, 0, who,
3137 "Equipping that combined with other items would consume your soul! " 3183 "Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3138 "[use the skills command to check your available item power]");
3139 return 1; 3184 return 1;
3140 } 3185 }
3141 3186
3142 /* Ok. We are now at the state where we can apply the new object. 3187 /* Ok. We are now at the state where we can apply the new object.
3143 * Note that we don't have the checks for can_use_... 3188 * Note that we don't have the checks for can_use_...
… …
3155 { 3200 {
3156 case WEAPON: 3201 case WEAPON:
3157 if (!check_weapon_power (who, op->last_eat)) 3202 if (!check_weapon_power (who, op->last_eat))
3158 { 3203 {
3159 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. " 3204 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
3160 "It would consume your soul!."); 3205 "It would consume your soul!." LACK_ITEM_POWER);
3161 3206
3162 if (tmp) 3207 if (tmp)
3163 insert_ob_in_ob (tmp, who); 3208 insert_ob_in_ob (tmp, who);
3164 3209
3165 return 1; 3210 return 1;
… …
3169 // i.e. "R" can use Ragnarok's sword. 3214 // i.e. "R" can use Ragnarok's sword.
3170 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3215 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3171 { 3216 {
3172 /* if the weapon does not have the name as the character, can't use it. */ 3217 /* if the weapon does not have the name as the character, can't use it. */
3173 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3218 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3174 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3219 new_draw_info (NDI_UNIQUE, 0, who,
3220 "The weapon does not recognize you as its owner. "
3221 "H<Its name indicates that it belongs to somebody else.>");
3175 3222
3176 if (tmp) 3223 if (tmp)
3177 insert_ob_in_ob (tmp, who); 3224 insert_ob_in_ob (tmp, who);
3178 3225
3179 return 1; 3226 return 1;
… …
3213 break; 3260 break;
3214 3261
3215 case LAMP: 3262 case LAMP:
3216 if (op->stats.food < 1) 3263 if (op->stats.food < 1)
3217 { 3264 {
3218 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name); 3265 new_draw_info_format (NDI_UNIQUE, 0, who,
3266 "Your %s is out of fuel! "
3267 "H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name);
3219 return 1; 3268 return 1;
3220 } 3269 }
3221 3270
3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3271 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3223 tmp2 = arch_to_object (op->other_arch); 3272 tmp2 = arch_to_object (op->other_arch);
… …
3246 who->update_stats (); 3295 who->update_stats ();
3247 3296
3248 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3249 if (who->type == PLAYER) 3298 if (who->type == PLAYER)
3250 { 3299 {
3251 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3300 new_draw_info (NDI_UNIQUE, 0, who,
3301 "Oops, it feels deadly cold! "
3302 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3252 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3303 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3253 } 3304 }
3254 3305
3255 if (who->type == PLAYER) 3306 if (who->type == PLAYER)
3256 esrv_send_item (who, tmp2); 3307 esrv_send_item (who, tmp2);
… …
3284 who->change_weapon (pl->combat_ob = item); 3335 who->change_weapon (pl->combat_ob = item);
3285 goto found_weapon; 3336 goto found_weapon;
3286 } 3337 }
3287 } 3338 }
3288 3339
3289 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill); 3340 new_draw_info_format (NDI_UNIQUE, 0, who,
3341 "You need to apply a '%s' melee weapon before readying this skill. "
3342 "H<Some skills need an item, in this case a melee weapon, to function.>",
3343 &op->skill);
3290 return 1; 3344 return 1;
3291 3345
3292 found_weapon:; 3346 found_weapon:;
3293 } 3347 }
3294 else 3348 else
… …
3304 //TODO: bows should/must all have skill missile weapon right now 3358 //TODO: bows should/must all have skill missile weapon right now
3305 who->change_weapon (pl->ranged_ob = item); 3359 who->change_weapon (pl->ranged_ob = item);
3306 goto found_bow; 3360 goto found_bow;
3307 } 3361 }
3308 3362
3363 new_draw_info (NDI_UNIQUE, 0, who,
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill"); 3364 "You need to apply a missile weapon before readying this skill. "
3365 "H<Some skills need an item, in this case a missile weapon, to function.>");
3310 return 1; 3366 return 1;
3311 3367
3312 found_bow:; 3368 found_bow:;
3313 } 3369 }
3314 else 3370 else
… …
3334 break; 3390 break;
3335 3391
3336 case BOW: 3392 case BOW:
3337 if (!check_weapon_power (who, op->last_eat)) 3393 if (!check_weapon_power (who, op->last_eat))
3338 { 3394 {
3339 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3395 new_draw_info (NDI_UNIQUE, 0, who,
3340 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3396 "That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3341 3397
3342 if (tmp) 3398 if (tmp)
3343 insert_ob_in_ob (tmp, who); 3399 insert_ob_in_ob (tmp, who);
3344 3400
3345 return 1; 3401 return 1;
3346 } 3402 }
3347 3403
3348 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3404 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3349 { 3405 {
3350 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3406 new_draw_info (NDI_UNIQUE, 0, who,
3407 "The weapon does not recognize you as its owner. "
3408 "H<Its name indicates that it belongs to somebody else.>");
3351 if (tmp) 3409 if (tmp)
3352 insert_ob_in_ob (tmp, who); 3410 insert_ob_in_ob (tmp, who);
3353 3411
3354 return 1; 3412 return 1;
3355 } 3413 }
… …
3423 */ 3481 */
3424 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3482 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3425 SET_FLAG (op, FLAG_BEEN_APPLIED); 3483 SET_FLAG (op, FLAG_BEEN_APPLIED);
3426 3484
3427 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3485 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3428 {
3429 if (who->type == PLAYER) 3486 if (who->type == PLAYER)
3430 { 3487 {
3431 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3488 new_draw_info (NDI_UNIQUE, 0, who,
3489 "Oops, it feels deadly cold! "
3490 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3432 SET_FLAG (op, FLAG_KNOWN_CURSED); 3491 SET_FLAG (op, FLAG_KNOWN_CURSED);
3433 } 3492 }
3434 }
3435 3493
3436 if (who->type == PLAYER) 3494 if (who->type == PLAYER)
3437 { 3495 {
3438 /* if multiple objects were applied, update both slots */ 3496 /* if multiple objects were applied, update both slots */
3439 if (tmp) 3497 if (tmp)
… …
3448int 3506int
3449monster_apply_special (object *who, object *op, int aflags) 3507monster_apply_special (object *who, object *op, int aflags)
3450{ 3508{
3451 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3509 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3452 return 1; 3510 return 1;
3511
3453 return apply_special (who, op, aflags); 3512 return apply_special (who, op, aflags);
3454} 3513}
3455 3514
3456/** 3515/**
3457 * Map was just loaded, handle op's initialisation. 3516 * Map was just loaded, handle op's initialisation.
… …
3783 3842
3784 if (failure <= -1 && failure > -15) 3843 if (failure <= -1 && failure > -15)
3785 { /* wonder */ 3844 { /* wonder */
3786 object *tmp; 3845 object *tmp;
3787 3846
3788 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3847 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!");
3789 tmp = get_archetype (SPELL_WONDER); 3848 tmp = get_archetype (SPELL_WONDER);
3790 cast_wonder (op, op, 0, tmp); 3849 cast_wonder (op, op, 0, tmp);
3791 tmp->destroy (); 3850 tmp->destroy ();
3792 } 3851 }
3793 else if (failure <= -15 && failure > -35) 3852 else if (failure <= -15 && failure > -35)
… …
3846 */ 3905 */
3847 int i, j; 3906 int i, j;
3848 3907
3849 for (i = 0; i < NUM_STATS; i++) 3908 for (i = 0; i < NUM_STATS; i++)
3850 { 3909 {
3851 int race_bonus = pl->arch->clone.stats.stat (i); 3910 int race_bonus = pl->arch->stats.stat (i);
3852 sint8 stat = stats->stat (i) + ns->stat (i); 3911 sint8 stat = stats->stat (i) + ns->stat (i);
3853 3912
3854 if (stat > 20 + race_bonus) 3913 if (stat > 20 + race_bonus)
3855 { 3914 {
3856 excess_stat++; 3915 excess_stat++;
… …
3866 3925
3867 if (i == CHA) 3926 if (i == CHA)
3868 continue; /* exclude cha from this */ 3927 continue; /* exclude cha from this */
3869 3928
3870 int stat = stats->stat (i); 3929 int stat = stats->stat (i);
3871 int race_bonus = pl->arch->clone.stats.stat (i); 3930 int race_bonus = pl->arch->stats.stat (i);
3872 if (stat < 20 + race_bonus) 3931 if (stat < 20 + race_bonus)
3873 { 3932 {
3874 change_attr_value (stats, i, 1); 3933 change_attr_value (stats, i, 1);
3875 excess_stat--; 3934 excess_stat--;
3876 } 3935 }
… …
3933 char got[MAX_BUF]; 3992 char got[MAX_BUF];
3934 int len; 3993 int len;
3935 3994
3936 if (!pl || !transformer) 3995 if (!pl || !transformer)
3937 return; 3996 return;
3997
3938 marked = find_marked_object (pl); 3998 marked = find_marked_object (pl);
3999
3939 if (!marked) 4000 if (!marked)
3940 { 4001 {
3941 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 4002 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
3942 return; 4003 return;
3943 } 4004 }
4005
3944 if (!marked->slaying) 4006 if (!marked->slaying)
3945 { 4007 {
3946 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4008 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3947 return; 4009 return;
3948 } 4010 }
4011
3949 /* check whether they are compatible or not */ 4012 /* check whether they are compatible or not */
3950 find = strstr (marked->slaying, transformer->arch->name); 4013 find = strstr (marked->slaying, transformer->arch->archname);
3951 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 4014 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3952 { 4015 {
3953 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4016 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3954 return; 4017 return;
3955 } 4018 }
4019
3956 find += strlen (transformer->arch->name) + 1; 4020 find += strlen (transformer->arch->archname) + 1;
3957 /* Item can be used, now find how many and what it yields */ 4021 /* Item can be used, now find how many and what it yields */
3958 if (isdigit (*(find))) 4022 if (isdigit (*(find)))
3959 { 4023 {
3960 yield = atoi (find); 4024 yield = atoi (find);
3961 if (yield < 1) 4025 if (yield < 1)
… …
3969 4033
3970 while (isdigit (*find)) 4034 while (isdigit (*find))
3971 find++; 4035 find++;
3972 while (*find == ' ') 4036 while (*find == ' ')
3973 find++; 4037 find++;
4038
3974 memset (got, 0, MAX_BUF); 4039 memset (got, 0, MAX_BUF);
4040
3975 if ((separator = strchr (find, ';')) != NULL) 4041 if ((separator = strchr (find, ';')) != NULL)
3976 {
3977 len = separator - find; 4042 len = separator - find;
3978 }
3979 else 4043 else
3980 {
3981 len = strlen (find); 4044 len = strlen (find);
3982 } 4045
3983 if (len > MAX_BUF - 1) 4046 if (len > MAX_BUF - 1)
3984 len = MAX_BUF - 1; 4047 len = MAX_BUF - 1;
4048
3985 strcpy (got, find); 4049 strcpy (got, find);
3986 got[len] = '\0'; 4050 got[len] = '\0';
3987 4051
3988 /* Now create new item, remove used ones when required. */ 4052 /* Now create new item, remove used ones when required. */
3989 new_item = get_archetype (got); 4053 new_item = get_archetype (got);
… …
3997 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4061 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
3998 insert_ob_in_ob (new_item, pl); 4062 insert_ob_in_ob (new_item, pl);
3999 esrv_send_inventory (pl, pl); 4063 esrv_send_inventory (pl, pl);
4000 /* Eat up one item */ 4064 /* Eat up one item */
4001 decrease_ob_nr (marked, 1); 4065 decrease_ob_nr (marked, 1);
4066
4002 /* Eat one transformer if needed */ 4067 /* Eat one transformer if needed */
4003 if (transformer->stats.food) 4068 if (transformer->stats.food)
4004 if (--transformer->stats.food == 0) 4069 if (--transformer->stats.food == 0)
4005 decrease_ob_nr (transformer, 1); 4070 decrease_ob_nr (transformer, 1);
4006} 4071}

Diff Legend

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