… | |
… | |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 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 | |
207 | |
213 | materialtype_t *materialt; |
208 | materialtype_t *materialt; |
214 | |
209 | |
215 | /* |
210 | /* |
216 | materialtype material[NROFMATERIALS] = { |
211 | materialtype material[NROFMATERIALS] = { |
… | |
… | |
327 | enc -= 2; |
322 | enc -= 2; |
328 | else if (op->path_repelled & (1 << i)) |
323 | else if (op->path_repelled & (1 << i)) |
329 | enc--; |
324 | enc--; |
330 | } |
325 | } |
331 | |
326 | |
332 | if (QUERY_FLAG (op, FLAG_LIFESAVE)) |
327 | if (op->flag [FLAG_LIFESAVE ]) enc += 5; |
333 | enc += 5; |
328 | if (op->flag [FLAG_REFL_SPELL ]) enc += 3; |
334 | if (QUERY_FLAG (op, FLAG_REFL_SPELL)) |
329 | if (op->flag [FLAG_REFL_MISSILE]) enc += 2; |
335 | enc += 3; |
330 | if (op->flag [FLAG_XRAYS ]) enc += 2; |
336 | if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) |
331 | if (op->flag [FLAG_STEALTH ]) enc += 1; |
337 | enc += 2; |
332 | if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1; |
338 | if (QUERY_FLAG (op, FLAG_STEALTH)) |
333 | if (op->flag [FLAG_MAKE_INVIS ]) enc += 1; |
339 | enc += 1; |
|
|
340 | if (QUERY_FLAG (op, FLAG_XRAYS)) |
|
|
341 | enc += 2; |
|
|
342 | if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) |
|
|
343 | enc += 1; |
|
|
344 | if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) |
|
|
345 | enc += 1; |
|
|
346 | |
334 | |
347 | return get_power_from_ench (enc); |
335 | return get_power_from_ench (enc); |
348 | } |
336 | } |
349 | |
337 | |
350 | /* returns the typedata that has a number equal to itemtype, if there |
338 | /* returns the typedata that has a number equal to itemtype, if there |
351 | * isn't one, returns NULL */ |
339 | * isn't one, returns NULL */ |
352 | const typedata * |
340 | const typedata * |
353 | get_typedata (int itemtype) |
341 | get_typedata (int itemtype) |
354 | { |
342 | { |
355 | int i; |
|
|
356 | |
|
|
357 | for (i = 0; i < item_types_size; i++) |
343 | for (int i = 0; i < item_types_size; i++) |
358 | if (item_types[i].number == itemtype) |
344 | if (item_types[i].number == itemtype) |
359 | return &item_types[i]; |
345 | return &item_types[i]; |
360 | |
346 | |
361 | return NULL; |
347 | return NULL; |
362 | } |
348 | } |
… | |
… | |
365 | * isn't one, return the plural name that matches, if there still isn't |
351 | * isn't one, return the plural name that matches, if there still isn't |
366 | * one return NULL */ |
352 | * one return NULL */ |
367 | const typedata * |
353 | const typedata * |
368 | get_typedata_by_name (const char *name) |
354 | get_typedata_by_name (const char *name) |
369 | { |
355 | { |
370 | int i; |
|
|
371 | |
|
|
372 | for (i = 0; i < item_types_size; i++) |
356 | for (int i = 0; i < item_types_size; i++) |
373 | if (!strcmp (item_types[i].name, name)) |
357 | if (!strcmp (item_types[i].name, name)) |
374 | return &item_types[i]; |
358 | return &item_types[i]; |
375 | |
359 | |
376 | for (i = 0; i < item_types_size; i++) |
360 | for (int i = 0; i < item_types_size; i++) |
377 | if (!strcmp (item_types[i].name_pl, name)) |
361 | if (!strcmp (item_types[i].name_pl, name)) |
378 | { |
362 | { |
379 | LOG (llevInfo, |
363 | LOG (llevInfo, |
380 | "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name); |
364 | "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name); |
381 | return &item_types[i]; |
365 | return &item_types[i]; |
382 | } |
366 | } |
383 | |
367 | |
384 | return NULL; |
368 | return 0; |
385 | } |
369 | } |
386 | |
370 | |
387 | /* describe_resistance generates the visible naming for resistances. |
371 | /* describe_resistance generates the visible naming for resistances. |
388 | * returns a static array of the description. This can return |
372 | * returns a static array of the description. This can return |
389 | * a big buffer. |
373 | * a big buffer. |
… | |
… | |
391 | * but do put a newline at the end. Useful when dumping to files |
375 | * but do put a newline at the end. Useful when dumping to files |
392 | */ |
376 | */ |
393 | const char * |
377 | const char * |
394 | describe_resistance (const object *op, int newline) |
378 | describe_resistance (const object *op, int newline) |
395 | { |
379 | { |
396 | static char buf[VERY_BIG_BUF]; |
380 | static dynbuf_text buf; buf.clear (); |
397 | char buf1[VERY_BIG_BUF]; |
|
|
398 | int tmpvar; |
|
|
399 | |
381 | |
400 | buf[0] = 0; |
382 | for (int i = 0; i < NROFATTACKS; i++) |
401 | for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++) |
|
|
402 | { |
|
|
403 | if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) |
383 | if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1)) |
404 | { |
384 | buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]); |
405 | if (!newline) |
|
|
406 | sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]); |
|
|
407 | else |
|
|
408 | sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]); |
|
|
409 | |
385 | |
410 | strcat (buf, buf1); |
|
|
411 | } |
|
|
412 | } |
|
|
413 | return buf; |
386 | return buf; |
414 | } |
387 | } |
415 | |
|
|
416 | |
388 | |
417 | /* |
389 | /* |
418 | * query_weight(object) returns a character pointer to a static buffer |
390 | * query_weight(object) returns a character pointer to a static buffer |
419 | * containing the text-representation of the weight of the given object. |
391 | * containing the text-representation of the weight of the given object. |
420 | * The buffer will be overwritten by the next call to query_weight(). |
392 | * The buffer will be overwritten by the next call to query_weight(). |
|
|
393 | * |
|
|
394 | * Seems to be used only by unimportant stuff. Remove? |
421 | */ |
395 | */ |
422 | const char * |
396 | const char * |
423 | query_weight (const object *op) |
397 | query_weight (const object *op) |
424 | { |
398 | { |
425 | static char buf[10]; |
399 | static char buf[10]; |
… | |
… | |
451 | return buf; |
425 | return buf; |
452 | } |
426 | } |
453 | |
427 | |
454 | if (i < 21) |
428 | if (i < 21) |
455 | return levelnumbers[i]; |
429 | return levelnumbers[i]; |
|
|
430 | |
456 | if (!(i % 10)) |
431 | if (!(i % 10)) |
457 | return levelnumbers_10[i / 10]; |
432 | return levelnumbers_10[i / 10]; |
458 | |
433 | |
459 | strcpy (buf, numbers_10[i / 10]); |
434 | strcpy (buf, numbers_10[i / 10]); |
460 | strcat (buf, levelnumbers[i % 10]); |
435 | strcat (buf, levelnumbers[i % 10]); |
461 | return buf; |
436 | return buf; |
462 | } |
|
|
463 | |
|
|
464 | /* |
|
|
465 | * get_number(integer) returns the text-representation of the given number |
|
|
466 | * in a static buffer. The buffer might be overwritten at the next |
|
|
467 | * call to get_number(). |
|
|
468 | * It is currently only used by the query_name() function. |
|
|
469 | */ |
|
|
470 | const char * |
|
|
471 | get_number (int i) |
|
|
472 | { |
|
|
473 | if (i <= 20) |
|
|
474 | return numbers[i]; |
|
|
475 | else |
|
|
476 | { |
|
|
477 | static char buf[MAX_BUF]; |
|
|
478 | |
|
|
479 | sprintf (buf, "%d", i); |
|
|
480 | return buf; |
|
|
481 | } |
|
|
482 | } |
437 | } |
483 | |
438 | |
484 | /* |
439 | /* |
485 | * Returns pointer to static buffer containing ring's or amulet's |
440 | * Returns pointer to static buffer containing ring's or amulet's |
486 | * abilities |
441 | * abilities |
… | |
… | |
492 | */ |
447 | */ |
493 | |
448 | |
494 | /* Aug 95 modified this slightly so that Skill tools don't have magic bonus |
449 | /* Aug 95 modified this slightly so that Skill tools don't have magic bonus |
495 | * from stats.sp - b.t. |
450 | * from stats.sp - b.t. |
496 | */ |
451 | */ |
497 | const char * |
452 | static const char * |
498 | ring_desc (const object *op) |
453 | ring_desc (const object *op) |
499 | { |
454 | { |
500 | static dynbuf_text buf; buf.clear (); |
455 | static dynbuf_text buf; buf.clear (); |
501 | int attr, val, len; |
456 | int attr, val, len; |
502 | |
457 | |
… | |
… | |
536 | } |
491 | } |
537 | |
492 | |
538 | /* |
493 | /* |
539 | * query_short_name(object) is similar to query_name, but doesn't |
494 | * query_short_name(object) is similar to query_name, but doesn't |
540 | * contain any information about object status (worn/cursed/etc.) |
495 | * contain any information about object status (worn/cursed/etc.) |
|
|
496 | * |
|
|
497 | * It is sometimes used when printing messages, so should fit well into a sentence. |
541 | */ |
498 | */ |
542 | const char * |
499 | const char * |
543 | query_short_name (const object *op) |
500 | query_short_name (const object *op) |
544 | { |
501 | { |
545 | if (!op->name) |
502 | if (!op->name) |
… | |
… | |
629 | * you can make several calls to query_name before the bufs start getting |
586 | * you can make several calls to query_name before the bufs start getting |
630 | * overwritten. This may be a bad thing (it may be easier to assume the value |
587 | * overwritten. This may be a bad thing (it may be easier to assume the value |
631 | * returned is good forever.) However, it makes printing statements that |
588 | * returned is good forever.) However, it makes printing statements that |
632 | * use several names much easier (don't need to store them to temp variables.) |
589 | * use several names much easier (don't need to store them to temp variables.) |
633 | * |
590 | * |
|
|
591 | * It is used extensively within messages, so should return only a prose |
|
|
592 | * and short description of the item. |
634 | */ |
593 | */ |
635 | const char * |
594 | const char * |
636 | query_name (const object *op) |
595 | query_name (const object *op) |
637 | { |
596 | { |
638 | int len = 0; |
597 | int len = 0; |
… | |
… | |
651 | |
610 | |
652 | buf << query_short_name (op); |
611 | buf << query_short_name (op); |
653 | |
612 | |
654 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
613 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
655 | buf << " *"; |
614 | buf << " *"; |
656 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
615 | if (op->is_open_container ()) |
657 | buf << " (open)"; |
616 | buf << " (open)"; |
658 | |
617 | |
659 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
618 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
660 | { |
619 | { |
661 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
620 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
… | |
… | |
675 | */ |
634 | */ |
676 | if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) |
635 | if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) |
677 | buf << " (magic)"; |
636 | buf << " (magic)"; |
678 | |
637 | |
679 | #if 0 |
638 | #if 0 |
680 | /* item_power will be returned in desribe_item - it shouldn't really |
639 | /* item_power will be returned in describe_item - it shouldn't really |
681 | * be returned in the name. |
640 | * be returned in the name. |
682 | */ |
641 | */ |
683 | if (op->item_power) |
642 | if (op->item_power) |
684 | sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); |
643 | sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); |
685 | |
644 | |
… | |
… | |
717 | default: |
676 | default: |
718 | buf << " (applied)"; |
677 | buf << " (applied)"; |
719 | } |
678 | } |
720 | } |
679 | } |
721 | |
680 | |
|
|
681 | switch (op->type) |
|
|
682 | { |
|
|
683 | case LAMP: |
|
|
684 | if (op->glow_radius) |
|
|
685 | buf << " (on)"; |
|
|
686 | else if (op->stats.food <= 0) |
|
|
687 | buf << " (empty)"; |
|
|
688 | else |
|
|
689 | buf << " (off)"; |
|
|
690 | break; |
|
|
691 | |
|
|
692 | case TORCH: |
|
|
693 | if (op->glow_radius) |
|
|
694 | buf << " (burning)"; |
|
|
695 | else if (op->stats.food <= 0) |
|
|
696 | buf << " (burned out)"; |
|
|
697 | break; |
|
|
698 | } |
|
|
699 | |
722 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
700 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
723 | buf << " (unpaid)"; |
701 | buf << " (unpaid)"; |
724 | |
702 | |
725 | return buf; |
703 | return buf; |
726 | } |
704 | } |
… | |
… | |
731 | * of the given object. The buffer will be overwritten at the next |
709 | * of the given object. The buffer will be overwritten at the next |
732 | * call to query_base_name(). This is a lot like query_name, but we |
710 | * call to query_base_name(). This is a lot like query_name, but we |
733 | * don't include the item count or item status. Used for inventory sorting |
711 | * don't include the item count or item status. Used for inventory sorting |
734 | * and sending to client. |
712 | * and sending to client. |
735 | * If plural is set, we generate the plural name of this. |
713 | * If plural is set, we generate the plural name of this. |
|
|
714 | * |
|
|
715 | * It is sometimes used to display messages, and usually only used to match stuff, |
|
|
716 | * so maybe this function should be removed. |
736 | */ |
717 | */ |
737 | const char * |
718 | const char * |
738 | query_base_name (const object *op, int plural) |
719 | query_base_name (const object *op, int plural) |
739 | { |
720 | { |
740 | if ((!plural && !op->name) || (plural && !op->name_pl)) |
721 | if ((!plural && !op->name) || (plural && !op->name_pl)) |
… | |
… | |
935 | * wouldn't need to use the SEE_INVISIBLE flag to know it is |
916 | * wouldn't need to use the SEE_INVISIBLE flag to know it is |
936 | * a dragon player examining food. Could have things like |
917 | * a dragon player examining food. Could have things like |
937 | * a dwarven axe, in which the full abilities are only known to |
918 | * a dwarven axe, in which the full abilities are only known to |
938 | * dwarves, etc. |
919 | * dwarves, etc. |
939 | * |
920 | * |
940 | * This function is really much more complicated than it should |
|
|
941 | * be, because different objects have different meanings |
|
|
942 | * for the same field (eg, wands use 'food' for charges). This |
|
|
943 | * means these special cases need to be worked out. |
|
|
944 | * |
|
|
945 | * Add 'owner' who is the person examining this object. |
921 | * Add 'owner' who is the person examining this object. |
946 | * owner can be null if no one is being associated with this |
922 | * owner can be null if no one is being associated with this |
947 | * item (eg, debug dump or the like) |
923 | * item (eg, debug dump or the like) |
948 | */ |
924 | */ |
949 | const char * |
925 | const char * |
… | |
… | |
1007 | buf << "well charged."; |
983 | buf << "well charged."; |
1008 | else if (op->stats.sp == op->stats.maxsp) |
984 | else if (op->stats.sp == op->stats.maxsp) |
1009 | buf << "fully charged."; |
985 | buf << "fully charged."; |
1010 | else |
986 | else |
1011 | buf << "almost full."; |
987 | buf << "almost full."; |
|
|
988 | break; |
|
|
989 | |
|
|
990 | case LAMP: |
|
|
991 | { |
|
|
992 | int percent = ((double) 100 / op->arch->stats.food) * op->stats.food; |
|
|
993 | buf << "(fuel: "; |
|
|
994 | if (percent == 0) |
|
|
995 | buf << "empty"; |
|
|
996 | else if (percent < 10) |
|
|
997 | buf << "very low"; |
|
|
998 | else if (percent < 25) |
|
|
999 | buf << "low"; |
|
|
1000 | else if (percent < 50) |
|
|
1001 | buf << "half empty"; |
|
|
1002 | else if (percent < 75) |
|
|
1003 | buf << "half full"; |
|
|
1004 | else if (percent < 95) |
|
|
1005 | buf << "well filled"; |
|
|
1006 | else if (percent <= 100) |
|
|
1007 | buf << "full"; |
|
|
1008 | buf << ")"; |
|
|
1009 | } |
1012 | break; |
1010 | break; |
1013 | |
1011 | |
1014 | case FOOD: |
1012 | case FOOD: |
1015 | case FLESH: |
1013 | case FLESH: |
1016 | case DRINK: |
1014 | case DRINK: |
… | |
… | |
1172 | if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; |
1170 | if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; |
1173 | |
1171 | |
1174 | if (op->slaying && op->type != FOOD) |
1172 | if (op->slaying && op->type != FOOD) |
1175 | buf.printf ("(slay %s)", &op->slaying); |
1173 | buf.printf ("(slay %s)", &op->slaying); |
1176 | |
1174 | |
|
|
1175 | if (op->type == SKILL_TOOL && op->skill) |
|
|
1176 | buf.printf ("(%s)", &op->skill); |
|
|
1177 | |
1177 | buf.add_abilities ("Attacks", op->attacktype); |
1178 | buf.add_abilities ("Attacks", op->attacktype); |
1178 | /* resistance on flesh is only visible for quetzals. If |
1179 | /* resistance on flesh is only visible for quetzals. If |
1179 | * non flesh, everyone can see its resistances |
1180 | * non flesh, everyone can see its resistances |
1180 | */ |
1181 | */ |
1181 | if (op->type != FLESH || (owner && is_dragon_pl (owner))) |
1182 | if (op->type != FLESH || (owner && is_dragon_pl (owner))) |
… | |
… | |
1197 | |
1198 | |
1198 | void |
1199 | void |
1199 | examine (object *op, object *tmp) |
1200 | examine (object *op, object *tmp) |
1200 | { |
1201 | { |
1201 | std::string info = tmp->describe (op); |
1202 | std::string info = tmp->describe (op); |
|
|
1203 | |
1202 | op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); |
1204 | op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); |
1203 | } |
1205 | } |
1204 | |
1206 | |
1205 | /* |
1207 | /* |
1206 | * inventory prints object's inventory. If inv==NULL then print player's |
1208 | * inventory prints object's inventory. If inv==NULL then print player's |