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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC vs.
Revision 1.113 by root, Sat Apr 3 02:27:24 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
25 * Object (handling) commands 26 * Object (handling) commands
26 */ 27 */
27 28
28#include <global.h> 29#include <global.h>
29#include <loader.h>
30#include <skills.h> 30#include <skills.h>
31#include <sproto.h> 31#include <sproto.h>
32#include <living.h> 32#include <living.h>
33#include <math.h>
34 33
35/* 34/*
36 * Object id parsing functions 35 * Object id parsing functions
37 */ 36 */
38 37
… …
133 { 132 {
134 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 133 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135 return 0; 134 return 0;
136 } 135 }
137 136
138 skill = find_skill_by_name (pl, params); 137 skill = find_skill_by_name_fuzzy (pl, params);
139 138
140 if (!skill) 139 if (!skill)
141 { 140 {
142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 141 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
143 return 0; 142 return 0;
144 } 143 }
145 144
146 pl->change_skill (0); 145 pl->apply (skill);
147 apply_special (pl, skill, AP_APPLY);
148 return 1; 146 return 1;
149}
150
151/* These functions (command_search, command_disarm) are really just wrappers for
152 * things like 'use_skill ...'). In fact, they should really be obsoleted
153 * and replaced with those.
154 */
155int
156command_search (object *op, char *params)
157{
158 return use_skill (op, skill_names[SK_FIND_TRAPS]);
159}
160
161int
162command_disarm (object *op, char *params)
163{
164 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
165} 147}
166 148
167/* A little special because we do want to pass the full params along 149/* A little special because we do want to pass the full params along
168 * as it includes the object to throw. 150 * as it includes the object to throw.
169 */ 151 */
… …
207 189
208 while (*params == ' ') 190 while (*params == ' ')
209 params++; 191 params++;
210 192
211 if (object *inv = find_best_apply_object_match (op, params, aflag)) 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
212 player_apply (op, inv, aflag, 0); 194 player_apply (op, inv, aflag);
213 else 195 else
214 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); 196 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
215 } 197 }
216 198
217 return 0; 199 return 0;
… …
241 return 0; 223 return 0;
242 } 224 }
243 225
244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 226 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
245 { 227 {
246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 228 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
247 return 0; 229 return 0;
248 } 230 }
249 231
250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251 { 233 {
… …
377 count = tmp->nrof; 359 count = tmp->nrof;
378 360
379 /* container is open, so use it */ 361 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP]) 362 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op; 363 alt = op;
382 else if (op->container) 364 else if ((alt = op->container_ ()))
383 { 365 {
384 alt = op->container;
385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386 goto leave; 367 goto leave;
387 } 368 }
388 else 369 else
389 { /* non container pickup */ 370 { /* non container pickup */
… …
443int 424int
444command_take (object *op, char *params) 425command_take (object *op, char *params)
445{ 426{
446 object *tmp, *next; 427 object *tmp, *next;
447 428
448 if (op->container) 429 if (op->container_ ())
449 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
450 else 431 else
451 { 432 {
452 tmp = op->above; 433 tmp = op->above;
453 if (tmp) 434 if (tmp)
454 while (tmp->above) 435 while (tmp->above)
… …
466 447
467 /* Makes processing easier */ 448 /* Makes processing easier */
468 if (params && *params == '\0') 449 if (params && *params == '\0')
469 params = 0; 450 params = 0;
470 451
471 int cnt = MAX_ITEM_PER_DROP; 452 int cnt = MAX_ITEM_PER_ACTION;
472 453
473 while (tmp) 454 while (tmp)
474 { 455 {
475 next = tmp->below; 456 next = tmp->below;
476 457
… …
520 501
521 return 0; 502 return 0;
522} 503}
523 504
524/* 505/*
525 * This function was part of drop, now is own function. 506 * This function was part of drop, now is own function.
526 * Player 'op' tries to put object 'tmp' into sack 'sack', 507 * Player 'op' tries to put object 'tmp' into sack 'sack',
527 * if nrof is non zero, then nrof objects is tried to put into sack. 508 * if nrof is non zero, then nrof objects is tried to put into sack.
509 *
528 * Note that the 'sack' in question can now be a transport, 510 * Note that the 'sack' in question can now be a transport,
529 * so this function isn't named very good anymore. 511 * so this function isn't named very good anymore.
530 */ 512 */
531void 513void
532put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
535 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
536 518
537 if (sack == tmp) 519 if (sack == tmp)
538 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
539 521
540 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
541 { 523 {
542 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 524 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
543 return; 525 return;
544 } 526 }
545 527
… …
554 536
555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
556 { 538 {
557 tmp = tmp2->below; 539 tmp = tmp2->below;
558 540
559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 541 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
560 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
561 else 543 else
562 { 544 {
563 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
564 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
585 567
586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 568 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
587 sack->insert (tmp); 569 sack->insert (tmp);
588} 570}
589 571
572/* In contrast to drop_object (op, tmp, nrof) above this function takes the
573 * already split off object, and feeds it to the event handlers and does
574 * other magic with it.
575 *
576 * <droppper> is the object that dropped this object and <obj> is the
577 * object that was dropped.
578 *
579 * Make sure to check what happened with <obj> after this function returns!
580 * Otherwise you may leak this object.
581 */
582void
583drop_object (object *dropper, object *obj)
584{
585 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
586 return;
587
588 if (obj->destroyed () || obj->is_inserted ())
589 return;
590
591 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
592 {
593 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
594 dropper->statusmsg ("The god who lent it to you retrieves it.");
595
596 obj->destroy ();
597 dropper->update_stats ();
598 return;
599 }
600
601 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
602 floor;
603 floor = floor->above)
604 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
605 return;
606
607 if (obj->destroyed () || obj->is_inserted ())
608 return;
609
610 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
611 if (!sell_item (obj, dropper))
612 return;
613
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return;
616
617 /* If nothing special happened with this object, the default action is to
618 * insert it below the dropper:
619 */
620
621 obj->x = dropper->x;
622 obj->y = dropper->y;
623
624 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
625}
626
590/* 627/*
591 * This function was part of drop, now is own function. 628 * This function was part of drop, now is own function.
592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 629 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
593 * nrof objects is tried to dropped. 630 * nrof objects are tried to drop.
594 * This is used when dropping objects onto the floor. 631 * This is used when dropping objects onto the floor.
595 */ 632 */
596void 633void
597drop_object (object *op, object *tmp, uint32 nrof) 634drop_object (object *op, object *tmp, uint32 nrof)
598{ 635{
… …
600 return; 637 return;
601 638
602 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 639 if (QUERY_FLAG (tmp, FLAG_APPLIED))
603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 640 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
604 return; /* can't unapply it */ 641 return; /* can't unapply it */
605
606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
607 642
608 /* We are only dropping some of the items. We split the current object 643 /* We are only dropping some of the items. We split the current object
609 * off 644 * off
610 */ 645 */
611 if (!can_split (op, tmp, nrof)) 646 if (!can_split (op, tmp, nrof))
612 return; 647 return;
613 648
614 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 649 drop_object (op, tmp);
615 return;
616 650
617 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 651 if (!tmp->destroyed () && !tmp->is_inserted ())
618 {
619 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
620 op->statusmsg ("The god who lent it to you retrieves it.");
621
622 tmp->destroy ();
623 op->update_stats ();
624 return;
625 } 652 {
626 653 // if nothing happened with the object we give it back
627 /* Call this before we update the various windows/players. At least
628 * that we, we know the weight is correct.
629 */
630 // 2007-11-26: moved op->update_stats away and calling it later after
631 // all items of a drop command have been processed.
632
633 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
634 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
635 return;
636
637 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
638 {
639 if (!sell_item (tmp, op))
640 {
641 // if we can't sell it we don't drop it, so give it back to the seller
642 op->insert (tmp); 654 op->insert (tmp);
643 return;
644 }
645 } 655 }
646
647 tmp->x = op->x;
648 tmp->y = op->y;
649
650 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
651} 656}
652 657
653void 658void
654drop (object *op, object *tmp) 659drop (object *op, object *tmp)
655{ 660{
… …
668 */ 673 */
669 tmp->destroy (); 674 tmp->destroy ();
670 return; 675 return;
671 } 676 }
672 else 677 else
673 {
674 while (tmp && tmp->invisible) 678 while (tmp && tmp->invisible)
675 tmp = tmp->below; 679 tmp = tmp->below;
676 }
677 } 680 }
678 681
679 if (tmp == NULL) 682 if (!tmp)
680 { 683 {
681 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 684 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
682 return; 685 return;
683 } 686 }
684 687
… …
698 } 701 }
699 702
700 if (op->type == PLAYER && op->contr->last_used == tmp) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
701 op->contr->last_used = tmp->below ? tmp->below 704 op->contr->last_used = tmp->below ? tmp->below
702 : tmp->above ? tmp->above 705 : tmp->above ? tmp->above
703 : 0; 706 : (object *)0;
704 707
705 if (op->container) 708 if (op->container_ ())
706 { 709 {
707 if (op->type == PLAYER) 710 if (op->type == PLAYER)
708 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
709 else 712 else
710 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
711 } 714 }
712 else 715 else
713 { 716 {
714 if (op->type == PLAYER) 717 if (op->type == PLAYER)
715 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
… …
742 /* 745 /*
743 Care must be taken that the next item pointer is not to money as 746 Care must be taken that the next item pointer is not to money as
744 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
745 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
746 */ 749 */
747
748 int cnt = MAX_ITEM_PER_DROP; 750 int cnt = MAX_ITEM_PER_ACTION;
749 751
750 if (!params) 752 if (!params)
751 { 753 {
752 while (curinv) 754 while (curinv)
753 { 755 {
754 nextinv = curinv->below; 756 nextinv = curinv->below;
755 757
756 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
757 nextinv = nextinv->below; 759 nextinv = nextinv->below;
758 760
759 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
760 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
761 curinv->type != SPECIAL_KEY && curinv->type != GEM && 763 && curinv->type != FOOD
764 && curinv->type != KEY
765 && curinv->type != SPECIAL_KEY
766 && curinv->type != GEM
767 && !curinv->invisible
762 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
763 { 769 {
764 drop (op, curinv); 770 drop (op, curinv);
765 if (--cnt <= 0) break; 771 if (--cnt <= 0) break;
766 } 772 }
767 773
… …
853 859
854/* draw_look(op);*/ 860/* draw_look(op);*/
855 return 0; 861 return 0;
856} 862}
857 863
864
865/* This function tries to drop all objects in the <objs> vector.
866 * <dropper> is the object that wants to drop them.
867 * <cnt> can be a 0 pointer or a pointer to the maximum number of
868 * drop operations to perform.
869 *
870 * Returns true if at least one item was dropped.
871 */
872static bool
873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
874{
875 vector<object *>::iterator i;
876
877 bool did_one = false;
878
879 for (i = objs.begin (); i != objs.end (); i++)
880 {
881 drop (dropper, *i);
882 if (cnt && --*cnt <= 0) break;
883 did_one = true;
884 }
885
886 return did_one;
887}
888
858/* Object op wants to drop object(s) params. params can be a 889/* Object op wants to drop object(s) params. params can be a
859 * comma seperated list. 890 * comma seperated list.
860 */ 891 */
861int 892int
862command_drop (object *op, char *params) 893command_drop (object *op, char *params)
… …
869 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
870 return 0; 901 return 0;
871 } 902 }
872 else 903 else
873 { 904 {
874 int cnt = MAX_ITEM_PER_DROP; 905 vector<object *> matched_objs;
875 906
876 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
877 { 908 {
878 next = tmp->below; 909 next = tmp->below;
879 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
880 continue; 911 continue;
881 912
882 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
883 { 914 matched_objs.push_back (tmp);
884 drop (op, tmp);
885 if (--cnt <= 0) break;
886 did_one = 1;
887 } 915 }
888 }
889 916
890 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
891 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
892 921
893 if (cnt <= 0) 922 if (cnt <= 0)
894 op->failmsg ("Only dropped some items, can't drop that many items at once."); 923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
895 } 924 }
… …
1025} 1054}
1026 1055
1027std::string 1056std::string
1028object::long_desc (object *who) 1057object::long_desc (object *who)
1029{ 1058{
1030 std::string buf (query_name (this)); 1059 std::string buf (query_name ());
1031 1060
1032 switch (type) 1061 switch (type)
1033 { 1062 {
1034 case RING: 1063 case RING:
1035 case SKILL: 1064 case SKILL:
… …
1047 case CLOAK: 1076 case CLOAK:
1048 case FOOD: 1077 case FOOD:
1049 case DRINK: 1078 case DRINK:
1050 case FLESH: 1079 case FLESH:
1051 case SKILL_TOOL: 1080 case SKILL_TOOL:
1081 case LAMP:
1052 case POWER_CRYSTAL: 1082 case POWER_CRYSTAL:
1053 { 1083 {
1054 const char *cp = ::describe_item (this, who); 1084 const char *cp = ::describe_item (this, who);
1055 1085
1056 if (*cp) 1086 if (*cp)
… …
1071examine_monster (object *op, object *tmp) 1101examine_monster (object *op, object *tmp)
1072{ 1102{
1073 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1103 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1074} 1104}
1075 1105
1106static void
1107describe_dump_object (dynbuf &buf, object *ob)
1108{
1109 char *txt = dump_object (ob);
1110 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1111 buf << "\n" << txt << "\n";
1112
1113 if (!ob->is_arch ())
1114 describe_dump_object (buf, ob->arch);
1115}
1116
1076std::string 1117std::string
1077object::describe (object *who) 1118object::describe (object *who)
1078{ 1119{
1079 dynbuf_text buf (1024, 1024); 1120 dynbuf_text buf (1024, 1024);
1080 1121
… …
1085 1126
1086 switch (type) 1127 switch (type)
1087 { 1128 {
1088 case SPELLBOOK: 1129 case SPELLBOOK:
1089 if (flag [FLAG_IDENTIFIED] && inv) 1130 if (flag [FLAG_IDENTIFIED] && inv)
1090 buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill); 1131 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1091 break; 1132 break;
1092 1133
1093 case BOOK: 1134 case BOOK:
1094 if (msg) 1135 if (msg)
1095 buf << "Something is written in it.\r"; 1136 buf << "Something is written in it.\r";
… …
1108 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str))); 1149 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1109 break; 1150 break;
1110 1151
1111 case WAND: 1152 case WAND:
1112 if (flag [FLAG_IDENTIFIED]) 1153 if (flag [FLAG_IDENTIFIED])
1113 buf.printf ("It has %d charges left.\r", stats.food); 1154 buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
1114 break; 1155 break;
1115 } 1156 }
1116 1157
1117 if (materialname && !msg) 1158 if (material != MATERIAL_NULL && !msg)
1118 buf.printf ("It is made of: %s.\r", &materialname); 1159 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1160 << material->description
1161 << ".\r";
1119 1162
1120 if (who) 1163 if (who)
1121 /* Where to wear this item */ 1164 /* Where to wear this item */
1122 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1165 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1123 if (slot[i].info) 1166 if (slot[i].info)
… …
1131 } 1174 }
1132 1175
1133 if (weight) 1176 if (weight)
1134 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0); 1177 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1135 1178
1179 if (flag [FLAG_STARTEQUIP])
1180 buf << (nrof > 1 ? "They were" : "It was")
1181 << " given by a god and will vanish when dropped.\r";
1182
1136 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1183 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1137 { 1184 {
1138 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); 1185 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1139 1186
1140 if (is_in_shop (who)) 1187 if (is_in_shop (who))
… …
1154 buf << "This is a buildable item.\r"; 1201 buf << "This is a buildable item.\r";
1155 1202
1156 /* Does the object have a message? Don't show message for all object 1203 /* Does the object have a message? Don't show message for all object
1157 * types - especially if the first entry is a match 1204 * types - especially if the first entry is a match
1158 */ 1205 */
1206 if (msg)
1207 {
1159 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ()) 1208 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1160 { 1209 {
1210 buf << '\r';
1211
1161 /* This is just a hack so when identifying the items, we print 1212 /* This is just a hack so when identifying the items, we print
1162 * out the extra message 1213 * out the extra message
1163 */ 1214 */
1164 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1215 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1165 buf << "The object has a story:\r"; 1216 buf << "The object has a story:\r";
1166 1217
1167 buf << msg << '\n'; 1218 buf << msg << '\n';
1219 }
1220 }
1221 else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1222 && (type == SPELLBOOK || type == ROD || type == WAND
1223 || type == ROD || type == POTION || type == SCROLL))
1224 // for spellbooks and other stuff that contains spells, print the spell message,
1225 // unless the object has a custom message handled above.
1226 buf << '\r' << inv->msg << '\n';
1227
1228 // try to display the duration for some potions and scrolls
1229 // this includes change ability potions and group spells,
1230 // but does not handle protection potions
1231 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1232 && (type == POTION || type == SCROLL))
1233 {
1234 object *spell = inv;
1235
1236 if (spell->subtype == SP_PARTY_SPELL)
1237 spell = spell->other_arch;
1238
1239 if (spell->subtype == SP_CHANGE_ABILITY)
1240 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1241 TICK2TIME (change_ability_duration (spell, this)));
1242 }
1243
1244 // Display a hint about inscribable items [empty books]
1245 // This includes the amount of text they can hold.
1246 if (type == INSCRIBABLE)
1247 {
1248 if (other_arch && other_arch->type == SCROLL)
1249 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1250 else
1251 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1252 weight_limit);
1168 } 1253 }
1169 1254
1170 buf << '\n'; 1255 buf << '\n';
1256
1257 // the dungeon master additionally gets a complete dump
1258 if (who && who->flag [FLAG_WIZLOOK])
1259 {
1260 buf << "\nT<Object>\n";
1261 describe_dump_object (buf, this);
1262
1263 if (inv)
1264 {
1265 buf << "\nT<Top Inventory>\n";
1266 describe_dump_object (buf, inv);
1267 }
1268 }
1171 1269
1172 return std::string (buf.linearise (), buf.size ()); 1270 return std::string (buf.linearise (), buf.size ());
1173} 1271}
1174 1272
1175static void 1273static void
1176display_new_pickup (object *op) 1274display_new_pickup (object *op)
1177{ 1275{
1178 int i = op->contr->mode; 1276 int i = op->contr->mode;
1179 1277
1180 if (!(i & PU_NEWMODE))
1181 return;
1182
1183 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1184 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0); 1278 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1185 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0); 1279 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1186 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0); 1280 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1187 1281
1188 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1239 }; 1333 };
1240 1334
1241 if (!params) 1335 if (!params)
1242 { 1336 {
1243 /* if the new mode is used, just print the settings */ 1337 /* if the new mode is used, just print the settings */
1244 if (op->contr->mode & PU_NEWMODE)
1245 {
1246 display_new_pickup (op); 1338 display_new_pickup (op);
1247 return 1;
1248 }
1249 if (1)
1250 LOG (llevDebug, "command_pickup: !params\n");
1251 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1252 return 0; 1339 return 0;
1253 } 1340 }
1254 1341
1255 while (*params == ' ' && *params) 1342 while (*params == ' ' && *params)
1256 params++; 1343 params++;
… …
1262 for (mode = 0; names[mode]; mode++) 1349 for (mode = 0; names[mode]; mode++)
1263 { 1350 {
1264 if (!strcmp (names[mode], params + 1)) 1351 if (!strcmp (names[mode], params + 1))
1265 { 1352 {
1266 i = op->contr->mode; 1353 i = op->contr->mode;
1267 if (!(i & PU_NEWMODE)) 1354
1268 i = PU_NEWMODE;
1269 if (*params == '+') 1355 if (*params == '+')
1270 i = i | modes[mode]; 1356 i = i | modes[mode];
1271 else 1357 else
1272 i = i & ~modes[mode]; 1358 i = i & ~modes[mode];
1359
1273 op->contr->mode = i; 1360 op->contr->mode = i;
1274 display_new_pickup (op); 1361 display_new_pickup (op);
1275 return 1; 1362 return 1;
1276 } 1363 }
1277 } 1364 }
… …
1279 return 1; 1366 return 1;
1280 } 1367 }
1281 1368
1282 if (sscanf (params, "%u", &i) != 1) 1369 if (sscanf (params, "%u", &i) != 1)
1283 { 1370 {
1284 if (1)
1285 LOG (llevDebug, "command_pickup: params==NULL\n");
1286 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> ."); 1371 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1287 return 1; 1372 return 1;
1288 } 1373 }
1289 set_pickup_mode (op, i); 1374
1375 if (i <= PU_RATIO)
1376 i |= op->contr->mode & ~PU_RATIO;
1377
1378 op->contr->mode = i;
1290 1379
1291 return 1; 1380 return 1;
1292}
1293
1294void
1295set_pickup_mode (object *op, int i)
1296{
1297 switch (op->contr->mode = i)
1298 {
1299 case 0:
1300 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1301 break;
1302 case 1:
1303 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1304 break;
1305 case 2:
1306 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1307 break;
1308 case 3:
1309 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1310 break;
1311 case 4:
1312 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1313 break;
1314 case 5:
1315 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1316 break;
1317 case 6:
1318 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1319 break;
1320 case 7:
1321 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1322 break;
1323 }
1324} 1381}
1325 1382
1326int 1383int
1327command_search_items (object *op, char *params) 1384command_search_items (object *op, char *params)
1328{ 1385{
1329 char buf[MAX_BUF];
1330
1331 if (settings.search_items == FALSE)
1332 return 1;
1333
1334 if (params == NULL) 1386 if (params == NULL)
1335 { 1387 {
1336 if (op->contr->search_str[0] == '\0') 1388 if (op->contr->search_str[0] == '\0')
1337 { 1389 {
1338 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1390 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1339 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all"); 1391 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1340 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'."); 1392 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1341 return 1; 1393 return 1;
1342 } 1394 }
1343 1395
1344 op->contr->search_str[0] = '\0'; 1396 op->contr->search_str[0] = '\0';
1345 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1397 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1346 op->update_stats (); 1398 op->contr->queue_stats_update ();
1347 return 1; 1399 return 1;
1348 } 1400 }
1349 1401
1350 if ((int) strlen (params) >= MAX_BUF) 1402 if (strlen (params) >= sizeof (op->contr->search_str))
1351 { 1403 {
1352 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1404 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1353 return 1; 1405 return 1;
1354 } 1406 }
1355 1407
1356 strcpy (op->contr->search_str, params); 1408 strcpy (op->contr->search_str, params);
1357 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1409 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1358 new_draw_info (NDI_UNIQUE, 0, op, buf); 1410 op->contr->queue_stats_update ();
1359 op->update_stats (); 1411
1360 return 1; 1412 return 1;
1361} 1413}
1362 1414
1415int
1416command_unlock (object *op, char *params)
1417{
1418 /* if the unlock command typed with nothing, unlock everything,
1419 * this might be bad
1420 */
1421 if (params == NULL)
1422 {
1423 for (object *item = op->inv; item; item = item->below)
1424 {
1425 CLEAR_FLAG(item, FLAG_INV_LOCKED);
1426 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1427 esrv_update_item (UPD_FLAGS, op, item);
1428 }
1429 return 0;
1430 }
1431
1432 /* if the unlock command is used with a param,
1433 * unlock what matches. i.e. unlock material, should unlock all the materials
1434 */
1435 for (object *item = op->inv; item; item = item->below)
1436 if (item->name.contains (params))
1437 {
1438 CLEAR_FLAG (item, FLAG_INV_LOCKED);
1439 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1440 esrv_update_item (UPD_FLAGS, op, item);
1441 }
1442
1443 return 0;
1444}
1445
1446int
1447command_lock (object *op, char *params)
1448{
1449 /* if the lock command is typed by itself, lock everything
1450 */
1451 if (params == NULL)
1452 {
1453 for (object *item = op->inv; item; item = item->below)
1454 {
1455 SET_FLAG (item, FLAG_INV_LOCKED);
1456 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1457 esrv_update_item (UPD_FLAGS, op, item);
1458 }
1459 return 0;
1460 }
1461
1462 /* if the lock command is used with a param, lock what matches.
1463 * i.e. lock material, should lock all the materials
1464 */
1465 for (object *item = op->inv; item; item = item->below)
1466 if (item->name.contains (params))
1467 {
1468 SET_FLAG (item, FLAG_INV_LOCKED);
1469 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1470 esrv_update_item (UPD_FLAGS, op, item);
1471 }
1472
1473 return 0;
1474}

Diff Legend

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