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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.44 by root, Sun Apr 13 21:22:47 2008 UTC vs.
Revision 1.64 by root, Fri Nov 6 13:31:47 2009 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 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>
25#include <funcpoint.h>
26#include <living.h> 26#include <living.h>
27#include <spells.h> 27#include <spells.h>
28 28
29const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 }; 29const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
30 30
… …
63 {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"},
64 {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"},
65 {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"},
66 {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"},
67/*{"body_dragon_torso", "your body", "a dragon's body"} */ 67/*{"body_dragon_torso", "your body", "a dragon's body"} */
68};
69
70static char numbers[21][20] = {
71 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
72 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
73 "eighteen", "nineteen", "twenty"
74}; 68};
75 69
76static char numbers_10[10][20] = { 70static char numbers_10[10][20] = {
77 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 71 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
78 "eighty", "ninety" 72 "eighty", "ninety"
… …
170 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 164 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
171 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 165 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
172 {SPINNER, "spinner", "spinners", 0, 0}, 166 {SPINNER, "spinner", "spinners", 0, 0},
173 {GATE, "gate", "gates", 0, 0}, 167 {GATE, "gate", "gates", 0, 0},
174 {BUTTON, "button", "buttons", 0, 0}, 168 {BUTTON, "button", "buttons", 0, 0},
175 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 169 {T_HANDLE, "cf handle", "cf handles", 0, 0},
176 {HOLE, "hole", "holes", 0, 0}, 170 {HOLE, "hole", "holes", 0, 0},
177 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 171 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
178 {SIGN, "sign", "signs", 0, 0}, 172 {SIGN, "sign", "signs", 0, 0},
179 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 173 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
180 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 174 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
207 {BUILDER, "item builder", "item builders", 0, 0}, 201 {BUILDER, "item builder", "item builders", 0, 0},
208 {MATERIAL, "building material", "building materials", 0, 0}, 202 {MATERIAL, "building material", "building materials", 0, 0},
209 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 203 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
210}; 204};
211 205
212const int item_types_size = sizeof (item_types) / sizeof (*item_types); 206static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
213 207
214materialtype_t *materialt; 208materialtype_t *materialt;
215 209
216/* 210/*
217materialtype material[NROFMATERIALS] = { 211materialtype material[NROFMATERIALS] = {
… …
253}; 247};
254 248
255int 249int
256get_power_from_ench (int ench) 250get_power_from_ench (int ench)
257{ 251{
258 if (ench < 0) ench = 0;
259 if (ench > 20) ench = 20;
260
261 return enc_to_item_power[ench]; 252 return enc_to_item_power [clamp (ench, 0, 20)];
262} 253}
263 254
264/* This takes an object 'op' and figures out what its item_power 255/* This takes an object 'op' and figures out what its item_power
265 * rating should be. This should only really be used by the treasure 256 * rating should be. This should only really be used by the treasure
266 * generation code, and when loading legacy objects. It returns 257 * generation code, and when loading legacy objects. It returns
… …
300 if (op->type == WEAPON) 291 if (op->type == WEAPON)
301 { 292 {
302 for (i = 1; i < NROFATTACKS; i++) 293 for (i = 1; i < NROFATTACKS; i++)
303 if (op->attacktype & (1 << i)) 294 if (op->attacktype & (1 << i))
304 enc++; 295 enc++;
296
305 if (op->slaying) 297 if (op->slaying)
306 enc += 2; /* What it slays is probably more relevent */ 298 enc += 2; /* What it slays is probably more relevent */
307 } 299 }
300
308 /* Items the player can equip */ 301 /* Items the player can equip */
309 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 302 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
310 (op->type == SHIELD) || (op->type == RING) || 303 (op->type == SHIELD) || (op->type == RING) ||
311 (op->type == BOOTS) || (op->type == GLOVES) || 304 (op->type == BOOTS) || (op->type == GLOVES) ||
312 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 305 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
… …
315 enc += op->stats.hp; /* hp regen */ 308 enc += op->stats.hp; /* hp regen */
316 enc += op->stats.sp; /* mana regen */ 309 enc += op->stats.sp; /* mana regen */
317 enc += op->stats.grace; /* grace regen */ 310 enc += op->stats.grace; /* grace regen */
318 enc += op->stats.exp; /* speed bonus */ 311 enc += op->stats.exp; /* speed bonus */
319 } 312 }
313
320 enc += op->stats.luck; 314 enc += op->stats.luck;
321 315
322 /* Do spell paths now */ 316 /* Do spell paths now */
323 for (i = 1; i < NRSPELLPATHS; i++) 317 for (i = 1; i < NRSPELLPATHS; i++)
324 { 318 {
… …
328 enc -= 2; 322 enc -= 2;
329 else if (op->path_repelled & (1 << i)) 323 else if (op->path_repelled & (1 << i))
330 enc--; 324 enc--;
331 } 325 }
332 326
333 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 327 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
334 enc += 5; 328 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
335 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 329 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
336 enc += 3; 330 if (op->flag [FLAG_XRAYS ]) enc += 2;
337 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 331 if (op->flag [FLAG_STEALTH ]) enc += 1;
338 enc += 2; 332 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
339 if (QUERY_FLAG (op, FLAG_STEALTH)) 333 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
340 enc += 1;
341 if (QUERY_FLAG (op, FLAG_XRAYS))
342 enc += 2;
343 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
344 enc += 1;
345 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
346 enc += 1;
347 334
348 return get_power_from_ench (enc); 335 return get_power_from_ench (enc);
349} 336}
350 337
351/* 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
352 * isn't one, returns NULL */ 339 * isn't one, returns NULL */
353const typedata * 340const typedata *
354get_typedata (int itemtype) 341get_typedata (int itemtype)
355{ 342{
356 int i;
357
358 for (i = 0; i < item_types_size; i++) 343 for (int i = 0; i < item_types_size; i++)
359 if (item_types[i].number == itemtype) 344 if (item_types[i].number == itemtype)
360 return &item_types[i]; 345 return &item_types[i];
346
361 return NULL; 347 return NULL;
362} 348}
363 349
364/* returns the typedata that has a name equal to itemtype, if there 350/* returns the typedata that has a name equal to itemtype, if there
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 */
367const typedata * 353const typedata *
368get_typedata_by_name (const char *name) 354get_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];
359
375 for (i = 0; i < item_types_size; i++) 360 for (int i = 0; i < item_types_size; i++)
376 if (!strcmp (item_types[i].name_pl, name)) 361 if (!strcmp (item_types[i].name_pl, name))
377 { 362 {
378 LOG (llevInfo, 363 LOG (llevInfo,
379 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is preffered\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);
380 return &item_types[i]; 365 return &item_types[i];
381 } 366 }
367
382 return NULL; 368 return 0;
383} 369}
384 370
385/* describe_resistance generates the visible naming for resistances. 371/* describe_resistance generates the visible naming for resistances.
386 * returns a static array of the description. This can return 372 * returns a static array of the description. This can return
387 * a big buffer. 373 * a big buffer.
… …
389 * 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
390 */ 376 */
391const char * 377const char *
392describe_resistance (const object *op, int newline) 378describe_resistance (const object *op, int newline)
393{ 379{
394 static char buf[VERY_BIG_BUF]; 380 static dynbuf_text buf; buf.clear ();
395 char buf1[VERY_BIG_BUF];
396 int tmpvar;
397 381
398 buf[0] = 0; 382 for (int i = 0; i < NROFATTACKS; i++)
399 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
400 {
401 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))
402 { 384 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
403 if (!newline)
404 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
405 else
406 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
407 385
408 strcat (buf, buf1);
409 }
410 }
411 return buf; 386 return buf;
412} 387}
413
414 388
415/* 389/*
416 * query_weight(object) returns a character pointer to a static buffer 390 * query_weight(object) returns a character pointer to a static buffer
417 * containing the text-representation of the weight of the given object. 391 * containing the text-representation of the weight of the given object.
418 * 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?
419 */ 395 */
420const char * 396const char *
421query_weight (const object *op) 397query_weight (const object *op)
422{ 398{
423 static char buf[10]; 399 static char buf[10];
424 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 400 sint32 i = op->total_weight ();
425 401
426 if (op->weight < 0) 402 if (op->weight < 0)
427 return " "; 403 return " ";
428 404
429 if (i % 1000) 405 if (i % 1000)
… …
449 return buf; 425 return buf;
450 } 426 }
451 427
452 if (i < 21) 428 if (i < 21)
453 return levelnumbers[i]; 429 return levelnumbers[i];
430
454 if (!(i % 10)) 431 if (!(i % 10))
455 return levelnumbers_10[i / 10]; 432 return levelnumbers_10[i / 10];
456 433
457 strcpy (buf, numbers_10[i / 10]); 434 strcpy (buf, numbers_10[i / 10]);
458 strcat (buf, levelnumbers[i % 10]); 435 strcat (buf, levelnumbers[i % 10]);
459 return buf; 436 return buf;
460}
461
462/*
463 * get_number(integer) returns the text-representation of the given number
464 * in a static buffer. The buffer might be overwritten at the next
465 * call to get_number().
466 * It is currently only used by the query_name() function.
467 */
468const char *
469get_number (int i)
470{
471 if (i <= 20)
472 return numbers[i];
473 else
474 {
475 static char buf[MAX_BUF];
476
477 sprintf (buf, "%d", i);
478 return buf;
479 }
480} 437}
481 438
482/* 439/*
483 * Returns pointer to static buffer containing ring's or amulet's 440 * Returns pointer to static buffer containing ring's or amulet's
484 * abilities 441 * abilities
… …
490 */ 447 */
491 448
492/* 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
493 * from stats.sp - b.t. 450 * from stats.sp - b.t.
494 */ 451 */
495const char * 452static const char *
496ring_desc (const object *op) 453ring_desc (const object *op)
497{ 454{
498 static dynbuf_text buf; buf.clear (); 455 static dynbuf_text buf; buf.clear ();
499 int attr, val, len; 456 int attr, val, len;
500 457
… …
534} 491}
535 492
536/* 493/*
537 * 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
538 * 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.
539 */ 498 */
540const char * 499const char *
541query_short_name (const object *op) 500query_short_name (const object *op)
542{ 501{
543 if (op->name == 0) 502 if (!op->name)
544 return "(null)"; 503 return "(null)";
545 504
546 if (!op->nrof 505 if (!op->nrof
547 && !op->weight 506 && !op->weight
548 && !op->title 507 && !op->title
… …
571 if (op->type != SPELLBOOK) 530 if (op->type != SPELLBOOK)
572 buf.printf (" (lvl %d)", op->level); 531 buf.printf (" (lvl %d)", op->level);
573 } 532 }
574 break; 533 break;
575 534
576 case ALTAR: 535 case ALTAR:
577 case TRIGGER_ALTAR: 536 case TRIGGER_ALTAR:
578 case IDENTIFY_ALTAR: 537 case IDENTIFY_ALTAR:
579 case CONVERTER: 538 case CONVERTER:
580 if (op->slaying == shstr_money) 539 if (op->slaying == shstr_money)
581 { 540 {
582 bool wrap = !!buf.size (); 541 bool wrap = !!buf.size ();
583 542
584 if (wrap) buf << " ["; 543 if (wrap) buf << " [";
585 544
586 archetype *coin = 0; 545 archetype *coin = 0;
587 546
588 for (char const *const *c = coins; *coins; ++c) 547 for (char const *const *c = coins; *coins; ++c)
589 if ((coin = archetype::find (*c))) 548 if ((coin = archetype::find (*c)))
590 if (op->stats.food % coin->value == 0) 549 if (op->stats.food % coin->value == 0)
591 break; 550 break;
592 551
593 sint32 coins = op->stats.food / coin->value; 552 sint32 coins = op->stats.food / coin->value;
594 553
595 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl); 554 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
596 555
597 if (wrap) buf << ']'; 556 if (wrap) buf << ']';
598 } 557 }
599 break; 558 break;
600 559
601 case SKILL: 560 case SKILL:
602 case AMULET: 561 case AMULET:
603 case RING: 562 case RING:
604 if (!op->title) 563 if (!op->title)
… …
627 * 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
628 * 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
629 * returned is good forever.) However, it makes printing statements that 588 * returned is good forever.) However, it makes printing statements that
630 * 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.)
631 * 590 *
591 * It is used extensively within messages, so should return only a prose
592 * and short description of the item.
632 */ 593 */
633const char * 594const char *
634query_name (const object *op) 595query_name (const object *op)
635{ 596{
636 int len = 0; 597 int len = 0;
… …
649 610
650 buf << query_short_name (op); 611 buf << query_short_name (op);
651 612
652 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 613 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
653 buf << " *"; 614 buf << " *";
654 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 615 if (op->is_open_container ())
655 buf << " (open)"; 616 buf << " (open)";
656 617
657 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 618 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
658 { 619 {
659 if (QUERY_FLAG (op, FLAG_DAMNED)) 620 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
673 */ 634 */
674 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))
675 buf << " (magic)"; 636 buf << " (magic)";
676 637
677#if 0 638#if 0
678 /* 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
679 * be returned in the name. 640 * be returned in the name.
680 */ 641 */
681 if (op->item_power) 642 if (op->item_power)
682 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);
683 644
… …
715 default: 676 default:
716 buf << " (applied)"; 677 buf << " (applied)";
717 } 678 }
718 } 679 }
719 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
720 if (QUERY_FLAG (op, FLAG_UNPAID)) 700 if (QUERY_FLAG (op, FLAG_UNPAID))
721 buf << " (unpaid)"; 701 buf << " (unpaid)";
722 702
723 return buf; 703 return buf;
724} 704}
… …
729 * 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
730 * 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
731 * 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
732 * and sending to client. 712 * and sending to client.
733 * 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.
734 */ 717 */
735const char * 718const char *
736query_base_name (const object *op, int plural) 719query_base_name (const object *op, int plural)
737{ 720{
738 if ((!plural && !op->name) || (plural && !op->name_pl)) 721 if ((!plural && !op->name) || (plural && !op->name_pl))
… …
808 */ 791 */
809 if (op->has_active_speed ()) 792 if (op->has_active_speed ())
810 switch ((int) ((FABS (op->speed)) * 15)) 793 switch ((int) ((FABS (op->speed)) * 15))
811 { 794 {
812 case 0: 795 case 0:
813 buf << "(very slow movement"; 796 buf << "(very slow movement)";
814 break; 797 break;
815 case 1: 798 case 1:
816 buf << "(slow movement)"; 799 buf << "(slow movement)";
817 break; 800 break;
818 case 2: 801 case 2:
… …
933 * 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
934 * a dragon player examining food. Could have things like 917 * a dragon player examining food. Could have things like
935 * 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
936 * dwarves, etc. 919 * dwarves, etc.
937 * 920 *
938 * This function is really much more complicated than it should
939 * be, because different objects have different meanings
940 * for the same field (eg, wands use 'food' for charges). This
941 * means these special cases need to be worked out.
942 *
943 * Add 'owner' who is the person examining this object. 921 * Add 'owner' who is the person examining this object.
944 * 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
945 * item (eg, debug dump or the like) 923 * item (eg, debug dump or the like)
946 */ 924 */
947const char * 925const char *
… …
1005 buf << "well charged."; 983 buf << "well charged.";
1006 else if (op->stats.sp == op->stats.maxsp) 984 else if (op->stats.sp == op->stats.maxsp)
1007 buf << "fully charged."; 985 buf << "fully charged.";
1008 else 986 else
1009 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 }
1010 break; 1010 break;
1011 1011
1012 case FOOD: 1012 case FOOD:
1013 case FLESH: 1013 case FLESH:
1014 case DRINK: 1014 case DRINK:
… …
1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1171 1171
1172 if (op->slaying && op->type != FOOD) 1172 if (op->slaying && op->type != FOOD)
1173 buf.printf ("(slay %s)", &op->slaying); 1173 buf.printf ("(slay %s)", &op->slaying);
1174 1174
1175 if (op->type == SKILL_TOOL && op->skill)
1176 buf.printf ("(%s)", &op->skill);
1177
1175 buf.add_abilities ("Attacks", op->attacktype); 1178 buf.add_abilities ("Attacks", op->attacktype);
1176 /* resistance on flesh is only visible for quetzals. If 1179 /* resistance on flesh is only visible for quetzals. If
1177 * non flesh, everyone can see its resistances 1180 * non flesh, everyone can see its resistances
1178 */ 1181 */
1179 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1182 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
… …
1194} 1197}
1195 1198
1196void 1199void
1197examine (object *op, object *tmp) 1200examine (object *op, object *tmp)
1198{ 1201{
1199 std::string s = tmp->describe (op); 1202 std::string info = tmp->describe (op);
1200 1203
1201 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ()); 1204 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1202} 1205}
1203 1206
1204/* 1207/*
1205 * 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
1206 * inventory. 1209 * inventory.
… …
1211{ 1214{
1212 static dynbuf_text buf; buf.clear (); 1215 static dynbuf_text buf; buf.clear ();
1213 1216
1214 for (object *tmp = inv; tmp; tmp = tmp->below) 1217 for (object *tmp = inv; tmp; tmp = tmp->below)
1215 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1218 if (who && QUERY_FLAG (who, FLAG_WIZ))
1216 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp)); 1219 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
1217 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1220 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1218 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp)); 1221 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1219 1222
1220 if (buf.size ()) 1223 if (buf.size ())
1221 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this)); 1224 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1222 else 1225 else
1223 buf.printf ("%s(empty)\n", indent); 1226 buf.printf ("%s(empty)\n", indent);
1224 1227
1225 return buf; 1228 return buf;
1226} 1229}
… …
1358 * Supposed to fix face-values as well here, but later. 1361 * Supposed to fix face-values as well here, but later.
1359 */ 1362 */
1360void 1363void
1361identify (object *op) 1364identify (object *op)
1362{ 1365{
1363 object *pl;
1364
1365 SET_FLAG (op, FLAG_IDENTIFIED); 1366 SET_FLAG (op, FLAG_IDENTIFIED);
1366 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1367 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1367 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1368 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1368 1369
1369 /* 1370 /*
… …
1376 { 1377 {
1377 if (op->inv && op->randomitems) 1378 if (op->inv && op->randomitems)
1378 op->title = op->inv->name; 1379 op->title = op->inv->name;
1379 else if (op->arch) 1380 else if (op->arch)
1380 { 1381 {
1381 op->name = op->arch->object::name; 1382 op->name = op->arch->object::name;
1382 op->name_pl = op->arch->object::name_pl; 1383 op->name_pl = op->arch->object::name_pl;
1383 } 1384 }
1384 } 1385 }
1385 1386
1386 /* If the object is on a map, make sure we update its face */ 1387 /* If the object is on a map, make sure we update its face */
1387 if (op->map) 1388 if (op->map)
1388 update_object (op, UP_OBJ_CHANGE); 1389 update_object (op, UP_OBJ_CHANGE);
1389 else 1390
1390 { 1391 if (object *pl = op->visible_to ())
1391 pl = op->in_player ();
1392 if (pl)
1393 /* A lot of the values can change from an update - might as well send 1392 /* A lot of the values can change from an update - might as well send
1394 * it all. 1393 * it all.
1395 */ 1394 */
1396 esrv_send_item (pl, op); 1395 esrv_send_item (pl, op);
1397 }
1398} 1396}
1399 1397

Diff Legend

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