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,2009 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 | #include <global.h> |
25 | #include <global.h> |
… | |
… | |
62 | {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"}, |
63 | {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"}, |
63 | {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"}, |
64 | {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"}, |
64 | {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"}, |
65 | {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"}, |
65 | {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"}, |
66 | {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"}, |
66 | /*{"body_dragon_torso", "your body", "a dragon's body"} */ |
67 | /*{"body_dragon_torso", "your body", "a dragon's body"} */ |
67 | }; |
|
|
68 | |
|
|
69 | static char numbers[21][20] = { |
|
|
70 | "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", |
|
|
71 | "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", |
|
|
72 | "eighteen", "nineteen", "twenty" |
|
|
73 | }; |
68 | }; |
74 | |
69 | |
75 | static char numbers_10[10][20] = { |
70 | static char numbers_10[10][20] = { |
76 | "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", |
71 | "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", |
77 | "eighty", "ninety" |
72 | "eighty", "ninety" |
… | |
… | |
169 | {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, |
164 | {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, |
170 | {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, |
165 | {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, |
171 | {SPINNER, "spinner", "spinners", 0, 0}, |
166 | {SPINNER, "spinner", "spinners", 0, 0}, |
172 | {GATE, "gate", "gates", 0, 0}, |
167 | {GATE, "gate", "gates", 0, 0}, |
173 | {BUTTON, "button", "buttons", 0, 0}, |
168 | {BUTTON, "button", "buttons", 0, 0}, |
174 | {CF_HANDLE, "cf handle", "cf handles", 0, 0}, |
169 | {T_HANDLE, "cf handle", "cf handles", 0, 0}, |
175 | {HOLE, "hole", "holes", 0, 0}, |
170 | {HOLE, "hole", "holes", 0, 0}, |
176 | {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, |
171 | {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, |
177 | {SIGN, "sign", "signs", 0, 0}, |
172 | {SIGN, "sign", "signs", 0, 0}, |
178 | {BOOTS, "boots", "boots", SK_SMITHERY, 0}, |
173 | {BOOTS, "boots", "boots", SK_SMITHERY, 0}, |
179 | {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, |
174 | {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, |
… | |
… | |
206 | {BUILDER, "item builder", "item builders", 0, 0}, |
201 | {BUILDER, "item builder", "item builders", 0, 0}, |
207 | {MATERIAL, "building material", "building materials", 0, 0}, |
202 | {MATERIAL, "building material", "building materials", 0, 0}, |
208 | {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, |
203 | {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, |
209 | }; |
204 | }; |
210 | |
205 | |
211 | const int item_types_size = sizeof (item_types) / sizeof (*item_types); |
206 | static const int item_types_size = sizeof (item_types) / sizeof (*item_types); |
212 | |
|
|
213 | materialtype_t *materialt; |
|
|
214 | |
|
|
215 | /* |
|
|
216 | materialtype material[NROFMATERIALS] = { |
|
|
217 | * P M F E C C A D W G P S P T F C D D C C G H B I * |
|
|
218 | * H A I L O O C R E H O L A U E A E E H O O O L N * |
|
|
219 | * Y G R E L N I A A O I O R R A N P A A U D L I T * |
|
|
220 | * S I E C D F D I P S S W A N R C L T O N Y N R * |
|
|
221 | * I C T U N O T O L E E H S T P D N * |
|
|
222 | {"paper", {15,10,17, 9, 5, 7,13, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}}, |
|
|
223 | {"metal", { 2,12, 3,12, 2,10, 7, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}}, |
|
|
224 | {"glass", {14,11, 8, 3,10, 5, 1, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}}, |
|
|
225 | {"leather", { 5,10,10, 3, 3,10,10, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}}, |
|
|
226 | {"wood", {10,11,13, 2, 2,10, 9, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}}, |
|
|
227 | {"organics", { 3,12, 9,11, 3,10, 9, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}}, |
|
|
228 | {"stone", { 2, 5, 2, 2, 2, 2, 1, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}}, |
|
|
229 | {"cloth", {14,11,13, 4, 4, 5,10, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}}, |
|
|
230 | {"adamant", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}}, |
|
|
231 | {"liquid", { 0, 8, 9, 6,17, 0,15, 0,20,15,12,0,0,0,0,11,0,0,0,0,0,0,0,0}}, |
|
|
232 | {"soft metal",{ 6,12, 6,14, 2,10, 1, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}}, |
|
|
233 | {"bone", {10, 9, 4, 5, 3,10,10, 0,20,15, 0,0,0,0,0, 2,0,0,0,0,0,0,0,0}}, |
|
|
234 | {"ice", {14,11,16, 5, 0, 5, 6, 0,20,15, 0,0,0,0,0, 7,0,0,0,0,0,0,0,0}} |
|
|
235 | }; |
|
|
236 | */ |
|
|
237 | |
207 | |
238 | /* This curve may be too steep. But the point is that there should |
208 | /* This curve may be too steep. But the point is that there should |
239 | * be tough choices - there is no real point to this if everyone can |
209 | * be tough choices - there is no real point to this if everyone can |
240 | * wear whatever they want with no worries. Perhaps having the steep |
210 | * wear whatever they want with no worries. Perhaps having the steep |
241 | * curve is good (maybe even steeper), but allowing players to |
211 | * curve is good (maybe even steeper), but allowing players to |
… | |
… | |
318 | |
288 | |
319 | enc += op->stats.luck; |
289 | enc += op->stats.luck; |
320 | |
290 | |
321 | /* Do spell paths now */ |
291 | /* Do spell paths now */ |
322 | for (i = 1; i < NRSPELLPATHS; i++) |
292 | for (i = 1; i < NRSPELLPATHS; i++) |
323 | { |
|
|
324 | if (op->path_attuned & (1 << i)) |
293 | if (op->path_attuned & (1 << i)) |
325 | enc++; |
294 | enc++; |
326 | else if (op->path_denied & (1 << i)) |
295 | else if (op->path_denied & (1 << i)) |
327 | enc -= 2; |
296 | enc -= 2; |
328 | else if (op->path_repelled & (1 << i)) |
297 | else if (op->path_repelled & (1 << i)) |
329 | enc--; |
298 | enc--; |
330 | } |
|
|
331 | |
299 | |
332 | if (op->flag [FLAG_LIFESAVE ]) enc += 5; |
300 | if (op->flag [FLAG_LIFESAVE ]) enc += 5; |
333 | if (op->flag [FLAG_REFL_SPELL ]) enc += 3; |
301 | if (op->flag [FLAG_REFL_SPELL ]) enc += 3; |
334 | if (op->flag [FLAG_REFL_MISSILE]) enc += 2; |
302 | if (op->flag [FLAG_REFL_MISSILE]) enc += 2; |
335 | if (op->flag [FLAG_XRAYS ]) enc += 2; |
303 | if (op->flag [FLAG_XRAYS ]) enc += 2; |
… | |
… | |
380 | * but do put a newline at the end. Useful when dumping to files |
348 | * but do put a newline at the end. Useful when dumping to files |
381 | */ |
349 | */ |
382 | const char * |
350 | const char * |
383 | describe_resistance (const object *op, int newline) |
351 | describe_resistance (const object *op, int newline) |
384 | { |
352 | { |
385 | static char buf[VERY_BIG_BUF]; |
353 | static dynbuf_text buf; buf.clear (); |
386 | char buf1[VERY_BIG_BUF]; |
|
|
387 | int tmpvar; |
|
|
388 | |
354 | |
389 | buf[0] = 0; |
355 | for (int i = 0; i < NROFATTACKS; i++) |
390 | for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++) |
|
|
391 | { |
|
|
392 | if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) |
356 | if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1)) |
393 | { |
357 | buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]); |
394 | if (!newline) |
|
|
395 | sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]); |
|
|
396 | else |
|
|
397 | sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]); |
|
|
398 | |
|
|
399 | strcat (buf, buf1); |
|
|
400 | } |
|
|
401 | } |
|
|
402 | |
358 | |
403 | return buf; |
359 | return buf; |
404 | } |
360 | } |
405 | |
|
|
406 | |
361 | |
407 | /* |
362 | /* |
408 | * query_weight(object) returns a character pointer to a static buffer |
363 | * query_weight(object) returns a character pointer to a static buffer |
409 | * containing the text-representation of the weight of the given object. |
364 | * containing the text-representation of the weight of the given object. |
410 | * The buffer will be overwritten by the next call to query_weight(). |
365 | * The buffer will be overwritten by the next call to query_weight(). |
… | |
… | |
450 | return levelnumbers_10[i / 10]; |
405 | return levelnumbers_10[i / 10]; |
451 | |
406 | |
452 | strcpy (buf, numbers_10[i / 10]); |
407 | strcpy (buf, numbers_10[i / 10]); |
453 | strcat (buf, levelnumbers[i % 10]); |
408 | strcat (buf, levelnumbers[i % 10]); |
454 | return buf; |
409 | return buf; |
455 | } |
|
|
456 | |
|
|
457 | /* |
|
|
458 | * get_number(integer) returns the text-representation of the given number |
|
|
459 | * in a static buffer. The buffer might be overwritten at the next |
|
|
460 | * call to get_number(). |
|
|
461 | * It is currently only used by the query_name() function. |
|
|
462 | */ |
|
|
463 | const char * |
|
|
464 | get_number (int i) |
|
|
465 | { |
|
|
466 | if (i <= 20) |
|
|
467 | return numbers[i]; |
|
|
468 | else |
|
|
469 | { |
|
|
470 | static char buf[MAX_BUF]; |
|
|
471 | |
|
|
472 | sprintf (buf, "%d", i); |
|
|
473 | return buf; |
|
|
474 | } |
|
|
475 | } |
410 | } |
476 | |
411 | |
477 | /* |
412 | /* |
478 | * Returns pointer to static buffer containing ring's or amulet's |
413 | * Returns pointer to static buffer containing ring's or amulet's |
479 | * abilities |
414 | * abilities |
… | |
… | |
485 | */ |
420 | */ |
486 | |
421 | |
487 | /* Aug 95 modified this slightly so that Skill tools don't have magic bonus |
422 | /* Aug 95 modified this slightly so that Skill tools don't have magic bonus |
488 | * from stats.sp - b.t. |
423 | * from stats.sp - b.t. |
489 | */ |
424 | */ |
490 | const char * |
425 | static const char * |
491 | ring_desc (const object *op) |
426 | ring_desc (const object *op) |
492 | { |
427 | { |
493 | static dynbuf_text buf; buf.clear (); |
428 | static dynbuf_text buf; buf.clear (); |
494 | int attr, val, len; |
429 | int attr, val, len; |
495 | |
430 | |
… | |
… | |
626 | * returned is good forever.) However, it makes printing statements that |
561 | * returned is good forever.) However, it makes printing statements that |
627 | * use several names much easier (don't need to store them to temp variables.) |
562 | * use several names much easier (don't need to store them to temp variables.) |
628 | * |
563 | * |
629 | * It is used extensively within messages, so should return only a prose |
564 | * It is used extensively within messages, so should return only a prose |
630 | * and short description of the item. |
565 | * and short description of the item. |
|
|
566 | * It is also used by examine/ex and similar functions. |
631 | */ |
567 | */ |
632 | const char * |
568 | const char * |
633 | query_name (const object *op) |
569 | query_name (const object *op) |
634 | { |
570 | { |
635 | int len = 0; |
571 | int len = 0; |
… | |
… | |
640 | use_buf %= 5; |
576 | use_buf %= 5; |
641 | |
577 | |
642 | dynbuf_text &buf = bufs [use_buf]; |
578 | dynbuf_text &buf = bufs [use_buf]; |
643 | buf.clear (); |
579 | buf.clear (); |
644 | |
580 | |
|
|
581 | #if 0 |
645 | if ((op->is_armor () || op->is_weapon ()) && op->materialname) |
582 | if ((op->is_armor () || op->is_weapon ()) && op->material) |
646 | if (materialtype_t *mt = name_to_material (op->materialname)) |
|
|
647 | buf << mt->description << ' '; |
583 | buf << op->material->description << ' '; |
|
|
584 | #endif |
648 | |
585 | |
649 | buf << query_short_name (op); |
586 | buf << query_short_name (op); |
650 | |
587 | |
651 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
588 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
652 | buf << " *"; |
589 | buf << " *"; |
653 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
590 | if (op->is_open_container ()) |
654 | buf << " (open)"; |
591 | buf << " (open)"; |
655 | |
592 | |
656 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
593 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
657 | { |
594 | { |
658 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
595 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
… | |
… | |
750 | * and sending to client. |
687 | * and sending to client. |
751 | * If plural is set, we generate the plural name of this. |
688 | * If plural is set, we generate the plural name of this. |
752 | * |
689 | * |
753 | * It is sometimes used to display messages, and usually only used to match stuff, |
690 | * It is sometimes used to display messages, and usually only used to match stuff, |
754 | * so maybe this function should be removed. |
691 | * so maybe this function should be removed. |
|
|
692 | * It is also used for client-side inventory/item descriptions. |
755 | */ |
693 | */ |
756 | const char * |
694 | const char * |
757 | query_base_name (const object *op, int plural) |
695 | query_base_name (const object *op, int plural) |
758 | { |
696 | { |
759 | if ((!plural && !op->name) || (plural && !op->name_pl)) |
697 | if ((!plural && !op->name) || (plural && !op->name_pl)) |
760 | return "(null)"; |
698 | return "(null)"; |
761 | |
699 | |
762 | if (!op->nrof && !op->weight && !op->title && !is_magical (op)) |
700 | if (!op->nrof && !op->weight && !op->title && !is_magical (op) |
|
|
701 | && op->type != EXIT) |
763 | return op->name; /* To speed things up (or make things slower?) */ |
702 | return op->name; /* To speed things up (or make things slower?) */ |
764 | |
703 | |
765 | static dynbuf_text buf; buf.clear (); |
704 | static dynbuf_text buf; buf.clear (); |
766 | |
705 | |
|
|
706 | #if 0 |
767 | if ((op->is_armor () || op->is_weapon ()) && op->materialname) |
707 | if ((op->is_armor () || op->is_weapon ()) && op->material) |
768 | if (materialtype_t *mt = name_to_material (op->materialname)) |
|
|
769 | if (op->arch->materialname != mt->name) |
708 | if (op->arch->material != op->material) |
770 | buf << mt->description << ' '; |
709 | buf << op->material->description << ' '; |
|
|
710 | #endif |
771 | |
711 | |
772 | buf << (plural ? op->name_pl : op->name); |
712 | buf << (plural ? op->name_pl : op->name); |
773 | |
713 | |
774 | if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) |
714 | if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) |
775 | buf << ' ' << op->title; |
715 | buf << ' ' << op->title; |
… | |
… | |
802 | if (s && *s) |
742 | if (s && *s) |
803 | buf << ' ' << s; |
743 | buf << ' ' << s; |
804 | } |
744 | } |
805 | break; |
745 | break; |
806 | |
746 | |
|
|
747 | case EXIT: |
|
|
748 | // random map exits "unfortunately" get patched, so this only works before entering |
|
|
749 | if (EXIT_PATH (op)) |
|
|
750 | buf << (EXIT_PATH (op) == shstr_random_map_exit ? " (random map)" : " (entry)"); |
|
|
751 | break; |
|
|
752 | |
807 | default: |
753 | default: |
808 | if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) |
754 | if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) |
809 | buf.printf (" %+d", op->magic); |
755 | buf.printf (" %+d", op->magic); |
810 | } |
756 | } |
811 | |
757 | |
… | |
… | |
826 | /* Note that the resolution this provides for players really isn't |
772 | /* Note that the resolution this provides for players really isn't |
827 | * very good. Any player with a speed greater than .67 will |
773 | * very good. Any player with a speed greater than .67 will |
828 | * fall into the 'lightning fast movement' category. |
774 | * fall into the 'lightning fast movement' category. |
829 | */ |
775 | */ |
830 | if (op->has_active_speed ()) |
776 | if (op->has_active_speed ()) |
831 | switch ((int) ((FABS (op->speed)) * 15)) |
777 | switch ((int)(op->speed * 15.)) |
832 | { |
778 | { |
833 | case 0: |
779 | case 0: |
834 | buf << "(very slow movement)"; |
780 | buf << "(very slow movement)"; |
835 | break; |
781 | break; |
836 | case 1: |
782 | case 1: |
… | |
… | |
906 | if (op->stats.luck) |
852 | if (op->stats.luck) |
907 | buf.printf ("(luck%+d)", op->stats.luck); |
853 | buf.printf ("(luck%+d)", op->stats.luck); |
908 | } |
854 | } |
909 | |
855 | |
910 | /* describe attacktypes */ |
856 | /* describe attacktypes */ |
911 | if (is_dragon_pl (op)) |
857 | if (op->is_dragon ()) |
912 | { |
858 | { |
913 | /* for dragon players display the attacktypes from clawing skill |
859 | /* for dragon players display the attacktypes from clawing skill |
914 | * Break apart the for loop - move the comparison checking down - |
860 | * Break apart the for loop - move the comparison checking down - |
915 | * this makes it more readable. |
861 | * this makes it more readable. |
916 | */ |
862 | */ |
… | |
… | |
1208 | if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; |
1154 | if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; |
1209 | |
1155 | |
1210 | if (op->slaying && op->type != FOOD) |
1156 | if (op->slaying && op->type != FOOD) |
1211 | buf.printf ("(slay %s)", &op->slaying); |
1157 | buf.printf ("(slay %s)", &op->slaying); |
1212 | |
1158 | |
|
|
1159 | if (op->type == SKILL_TOOL && op->skill) |
|
|
1160 | buf.printf ("(%s)", &op->skill); |
|
|
1161 | |
1213 | buf.add_abilities ("Attacks", op->attacktype); |
1162 | buf.add_abilities ("Attacks", op->attacktype); |
1214 | /* resistance on flesh is only visible for quetzals. If |
1163 | /* resistance on flesh is only visible for quetzals. If |
1215 | * non flesh, everyone can see its resistances |
1164 | * non flesh, everyone can see its resistances |
1216 | */ |
1165 | */ |
1217 | if (op->type != FLESH || (owner && is_dragon_pl (owner))) |
1166 | if (op->type != FLESH || (owner && owner->is_dragon ())) |
1218 | buf << describe_resistance (op, 0); |
1167 | buf << describe_resistance (op, 0); |
1219 | |
1168 | |
1220 | buf.add_paths ("Attuned", op->path_attuned); |
1169 | buf.add_paths ("Attuned", op->path_attuned); |
1221 | buf.add_paths ("Repelled", op->path_repelled); |
1170 | buf.add_paths ("Repelled", op->path_repelled); |
1222 | buf.add_paths ("Denied", op->path_denied); |
1171 | buf.add_paths ("Denied", op->path_denied); |
… | |
… | |
1249 | { |
1198 | { |
1250 | static dynbuf_text buf; buf.clear (); |
1199 | static dynbuf_text buf; buf.clear (); |
1251 | |
1200 | |
1252 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1201 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1253 | if (who && QUERY_FLAG (who, FLAG_WIZ)) |
1202 | if (who && QUERY_FLAG (who, FLAG_WIZ)) |
1254 | buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ()); |
1203 | buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ()); |
1255 | else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) |
1204 | else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) |
1256 | buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ()); |
1205 | buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ()); |
1257 | |
1206 | |
1258 | if (buf.size ()) |
1207 | if (buf.size ()) |
1259 | buf.printf ("%s(total weight: %s)\n", indent, query_weight ()); |
1208 | buf.printf ("%s(total weight: %s)\n", indent, query_weight ()); |