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.46 by root, Sun Apr 20 22:03:21 2008 UTC vs.
Revision 1.66 by root, Sun Nov 8 20:55:39 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 {
325 if (op->path_attuned & (1 << i)) 318 if (op->path_attuned & (1 << i))
326 enc++; 319 enc++;
327 else if (op->path_denied & (1 << i)) 320 else if (op->path_denied & (1 << i))
328 enc -= 2; 321 enc -= 2;
329 else if (op->path_repelled & (1 << i)) 322 else if (op->path_repelled & (1 << i))
330 enc--; 323 enc--;
331 }
332 324
333 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 325 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
334 enc += 5; 326 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
335 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 327 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
336 enc += 3; 328 if (op->flag [FLAG_XRAYS ]) enc += 2;
337 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 329 if (op->flag [FLAG_STEALTH ]) enc += 1;
338 enc += 2; 330 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
339 if (QUERY_FLAG (op, FLAG_STEALTH)) 331 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 332
348 return get_power_from_ench (enc); 333 return get_power_from_ench (enc);
349} 334}
350 335
351/* returns the typedata that has a number equal to itemtype, if there 336/* returns the typedata that has a number equal to itemtype, if there
352 * isn't one, returns NULL */ 337 * isn't one, returns NULL */
353const typedata * 338const typedata *
354get_typedata (int itemtype) 339get_typedata (int itemtype)
355{ 340{
356 int i;
357
358 for (i = 0; i < item_types_size; i++) 341 for (int i = 0; i < item_types_size; i++)
359 if (item_types[i].number == itemtype) 342 if (item_types[i].number == itemtype)
360 return &item_types[i]; 343 return &item_types[i];
344
361 return NULL; 345 return NULL;
362} 346}
363 347
364/* returns the typedata that has a name equal to itemtype, if there 348/* 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 349 * isn't one, return the plural name that matches, if there still isn't
366 * one return NULL */ 350 * one return NULL */
367const typedata * 351const typedata *
368get_typedata_by_name (const char *name) 352get_typedata_by_name (const char *name)
369{ 353{
370 int i;
371
372 for (i = 0; i < item_types_size; i++) 354 for (int i = 0; i < item_types_size; i++)
373 if (!strcmp (item_types[i].name, name)) 355 if (!strcmp (item_types[i].name, name))
374 return &item_types[i]; 356 return &item_types[i];
357
375 for (i = 0; i < item_types_size; i++) 358 for (int i = 0; i < item_types_size; i++)
376 if (!strcmp (item_types[i].name_pl, name)) 359 if (!strcmp (item_types[i].name_pl, name))
377 { 360 {
378 LOG (llevInfo, 361 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); 362 "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]; 363 return &item_types[i];
381 } 364 }
365
382 return NULL; 366 return 0;
383} 367}
384 368
385/* describe_resistance generates the visible naming for resistances. 369/* describe_resistance generates the visible naming for resistances.
386 * returns a static array of the description. This can return 370 * returns a static array of the description. This can return
387 * a big buffer. 371 * a big buffer.
… …
389 * but do put a newline at the end. Useful when dumping to files 373 * but do put a newline at the end. Useful when dumping to files
390 */ 374 */
391const char * 375const char *
392describe_resistance (const object *op, int newline) 376describe_resistance (const object *op, int newline)
393{ 377{
394 static char buf[VERY_BIG_BUF]; 378 static dynbuf_text buf; buf.clear ();
395 char buf1[VERY_BIG_BUF];
396 int tmpvar;
397 379
398 buf[0] = 0; 380 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)) 381 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
402 { 382 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 383
408 strcat (buf, buf1);
409 }
410 }
411 return buf; 384 return buf;
412} 385}
413
414 386
415/* 387/*
416 * query_weight(object) returns a character pointer to a static buffer 388 * query_weight(object) returns a character pointer to a static buffer
417 * containing the text-representation of the weight of the given object. 389 * containing the text-representation of the weight of the given object.
418 * The buffer will be overwritten by the next call to query_weight(). 390 * The buffer will be overwritten by the next call to query_weight().
391 *
392 * Seems to be used only by unimportant stuff. Remove?
419 */ 393 */
420const char * 394const char *
421query_weight (const object *op) 395query_weight (const object *op)
422{ 396{
423 static char buf[10]; 397 static char buf[10];
… …
449 return buf; 423 return buf;
450 } 424 }
451 425
452 if (i < 21) 426 if (i < 21)
453 return levelnumbers[i]; 427 return levelnumbers[i];
428
454 if (!(i % 10)) 429 if (!(i % 10))
455 return levelnumbers_10[i / 10]; 430 return levelnumbers_10[i / 10];
456 431
457 strcpy (buf, numbers_10[i / 10]); 432 strcpy (buf, numbers_10[i / 10]);
458 strcat (buf, levelnumbers[i % 10]); 433 strcat (buf, levelnumbers[i % 10]);
459 return buf; 434 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} 435}
481 436
482/* 437/*
483 * Returns pointer to static buffer containing ring's or amulet's 438 * Returns pointer to static buffer containing ring's or amulet's
484 * abilities 439 * abilities
… …
490 */ 445 */
491 446
492/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 447/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
493 * from stats.sp - b.t. 448 * from stats.sp - b.t.
494 */ 449 */
495const char * 450static const char *
496ring_desc (const object *op) 451ring_desc (const object *op)
497{ 452{
498 static dynbuf_text buf; buf.clear (); 453 static dynbuf_text buf; buf.clear ();
499 int attr, val, len; 454 int attr, val, len;
500 455
… …
534} 489}
535 490
536/* 491/*
537 * query_short_name(object) is similar to query_name, but doesn't 492 * query_short_name(object) is similar to query_name, but doesn't
538 * contain any information about object status (worn/cursed/etc.) 493 * contain any information about object status (worn/cursed/etc.)
494 *
495 * It is sometimes used when printing messages, so should fit well into a sentence.
539 */ 496 */
540const char * 497const char *
541query_short_name (const object *op) 498query_short_name (const object *op)
542{ 499{
543 if (op->name == 0) 500 if (!op->name)
544 return "(null)"; 501 return "(null)";
545 502
546 if (!op->nrof 503 if (!op->nrof
547 && !op->weight 504 && !op->weight
548 && !op->title 505 && !op->title
… …
571 if (op->type != SPELLBOOK) 528 if (op->type != SPELLBOOK)
572 buf.printf (" (lvl %d)", op->level); 529 buf.printf (" (lvl %d)", op->level);
573 } 530 }
574 break; 531 break;
575 532
576 case ALTAR: 533 case ALTAR:
577 case TRIGGER_ALTAR: 534 case TRIGGER_ALTAR:
578 case IDENTIFY_ALTAR: 535 case IDENTIFY_ALTAR:
579 case CONVERTER: 536 case CONVERTER:
580 if (op->slaying == shstr_money) 537 if (op->slaying == shstr_money)
581 { 538 {
582 bool wrap = !!buf.size (); 539 bool wrap = !!buf.size ();
583 540
584 if (wrap) buf << " ["; 541 if (wrap) buf << " [";
585 542
586 archetype *coin = 0; 543 archetype *coin = 0;
587 544
588 for (char const *const *c = coins; *coins; ++c) 545 for (char const *const *c = coins; *coins; ++c)
589 if ((coin = archetype::find (*c))) 546 if ((coin = archetype::find (*c)))
590 if (op->stats.food % coin->value == 0) 547 if (op->stats.food % coin->value == 0)
591 break; 548 break;
592 549
593 sint32 coins = op->stats.food / coin->value; 550 sint32 coins = op->stats.food / coin->value;
594 551
595 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl); 552 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
596 553
597 if (wrap) buf << ']'; 554 if (wrap) buf << ']';
598 } 555 }
599 break; 556 break;
600 557
601 case SKILL: 558 case SKILL:
602 case AMULET: 559 case AMULET:
603 case RING: 560 case RING:
604 if (!op->title) 561 if (!op->title)
… …
627 * you can make several calls to query_name before the bufs start getting 584 * 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 585 * 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 586 * 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.) 587 * use several names much easier (don't need to store them to temp variables.)
631 * 588 *
589 * It is used extensively within messages, so should return only a prose
590 * and short description of the item.
632 */ 591 */
633const char * 592const char *
634query_name (const object *op) 593query_name (const object *op)
635{ 594{
636 int len = 0; 595 int len = 0;
… …
649 608
650 buf << query_short_name (op); 609 buf << query_short_name (op);
651 610
652 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 611 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
653 buf << " *"; 612 buf << " *";
654 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 613 if (op->is_open_container ())
655 buf << " (open)"; 614 buf << " (open)";
656 615
657 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 616 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
658 { 617 {
659 if (QUERY_FLAG (op, FLAG_DAMNED)) 618 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
673 */ 632 */
674 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 633 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
675 buf << " (magic)"; 634 buf << " (magic)";
676 635
677#if 0 636#if 0
678 /* item_power will be returned in desribe_item - it shouldn't really 637 /* item_power will be returned in describe_item - it shouldn't really
679 * be returned in the name. 638 * be returned in the name.
680 */ 639 */
681 if (op->item_power) 640 if (op->item_power)
682 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 641 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
683 642
… …
715 default: 674 default:
716 buf << " (applied)"; 675 buf << " (applied)";
717 } 676 }
718 } 677 }
719 678
679 switch (op->type)
680 {
681 case LAMP:
682 if (op->glow_radius)
683 buf << " (on)";
684 else if (op->stats.food <= 0)
685 buf << " (empty)";
686 else
687 buf << " (off)";
688 break;
689
690 case TORCH:
691 if (op->glow_radius)
692 buf << " (burning)";
693 else if (op->stats.food <= 0)
694 buf << " (burned out)";
695 break;
696 }
697
720 if (QUERY_FLAG (op, FLAG_UNPAID)) 698 if (QUERY_FLAG (op, FLAG_UNPAID))
721 buf << " (unpaid)"; 699 buf << " (unpaid)";
722 700
723 return buf; 701 return buf;
724} 702}
… …
729 * of the given object. The buffer will be overwritten at the next 707 * 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 708 * 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 709 * don't include the item count or item status. Used for inventory sorting
732 * and sending to client. 710 * and sending to client.
733 * If plural is set, we generate the plural name of this. 711 * If plural is set, we generate the plural name of this.
712 *
713 * It is sometimes used to display messages, and usually only used to match stuff,
714 * so maybe this function should be removed.
734 */ 715 */
735const char * 716const char *
736query_base_name (const object *op, int plural) 717query_base_name (const object *op, int plural)
737{ 718{
738 if ((!plural && !op->name) || (plural && !op->name_pl)) 719 if ((!plural && !op->name) || (plural && !op->name_pl))
… …
805 /* Note that the resolution this provides for players really isn't 786 /* Note that the resolution this provides for players really isn't
806 * very good. Any player with a speed greater than .67 will 787 * very good. Any player with a speed greater than .67 will
807 * fall into the 'lightning fast movement' category. 788 * fall into the 'lightning fast movement' category.
808 */ 789 */
809 if (op->has_active_speed ()) 790 if (op->has_active_speed ())
810 switch ((int) ((FABS (op->speed)) * 15)) 791 switch ((int)((fabs (op->speed)) * 15.))
811 { 792 {
812 case 0: 793 case 0:
813 buf << "(very slow movement"; 794 buf << "(very slow movement)";
814 break; 795 break;
815 case 1: 796 case 1:
816 buf << "(slow movement)"; 797 buf << "(slow movement)";
817 break; 798 break;
818 case 2: 799 case 2:
… …
933 * wouldn't need to use the SEE_INVISIBLE flag to know it is 914 * wouldn't need to use the SEE_INVISIBLE flag to know it is
934 * a dragon player examining food. Could have things like 915 * a dragon player examining food. Could have things like
935 * a dwarven axe, in which the full abilities are only known to 916 * a dwarven axe, in which the full abilities are only known to
936 * dwarves, etc. 917 * dwarves, etc.
937 * 918 *
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. 919 * Add 'owner' who is the person examining this object.
944 * owner can be null if no one is being associated with this 920 * owner can be null if no one is being associated with this
945 * item (eg, debug dump or the like) 921 * item (eg, debug dump or the like)
946 */ 922 */
947const char * 923const char *
… …
1005 buf << "well charged."; 981 buf << "well charged.";
1006 else if (op->stats.sp == op->stats.maxsp) 982 else if (op->stats.sp == op->stats.maxsp)
1007 buf << "fully charged."; 983 buf << "fully charged.";
1008 else 984 else
1009 buf << "almost full."; 985 buf << "almost full.";
986 break;
987
988 case LAMP:
989 {
990 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
991 buf << "(fuel: ";
992 if (percent == 0)
993 buf << "empty";
994 else if (percent < 10)
995 buf << "very low";
996 else if (percent < 25)
997 buf << "low";
998 else if (percent < 50)
999 buf << "half empty";
1000 else if (percent < 75)
1001 buf << "half full";
1002 else if (percent < 95)
1003 buf << "well filled";
1004 else if (percent <= 100)
1005 buf << "full";
1006 buf << ")";
1007 }
1010 break; 1008 break;
1011 1009
1012 case FOOD: 1010 case FOOD:
1013 case FLESH: 1011 case FLESH:
1014 case DRINK: 1012 case DRINK:
… …
1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1168 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1171 1169
1172 if (op->slaying && op->type != FOOD) 1170 if (op->slaying && op->type != FOOD)
1173 buf.printf ("(slay %s)", &op->slaying); 1171 buf.printf ("(slay %s)", &op->slaying);
1174 1172
1173 if (op->type == SKILL_TOOL && op->skill)
1174 buf.printf ("(%s)", &op->skill);
1175
1175 buf.add_abilities ("Attacks", op->attacktype); 1176 buf.add_abilities ("Attacks", op->attacktype);
1176 /* resistance on flesh is only visible for quetzals. If 1177 /* resistance on flesh is only visible for quetzals. If
1177 * non flesh, everyone can see its resistances 1178 * non flesh, everyone can see its resistances
1178 */ 1179 */
1179 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1180 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
… …
1195 1196
1196void 1197void
1197examine (object *op, object *tmp) 1198examine (object *op, object *tmp)
1198{ 1199{
1199 std::string info = tmp->describe (op); 1200 std::string info = tmp->describe (op);
1201
1200 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); 1202 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1201} 1203}
1202 1204
1203/* 1205/*
1204 * inventory prints object's inventory. If inv==NULL then print player's 1206 * inventory prints object's inventory. If inv==NULL then print player's
… …
1210{ 1212{
1211 static dynbuf_text buf; buf.clear (); 1213 static dynbuf_text buf; buf.clear ();
1212 1214
1213 for (object *tmp = inv; tmp; tmp = tmp->below) 1215 for (object *tmp = inv; tmp; tmp = tmp->below)
1214 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1216 if (who && QUERY_FLAG (who, FLAG_WIZ))
1215 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp)); 1217 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
1216 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1218 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1217 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp)); 1219 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1218 1220
1219 if (buf.size ()) 1221 if (buf.size ())
1220 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this)); 1222 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1221 else 1223 else
1222 buf.printf ("%s(empty)\n", indent); 1224 buf.printf ("%s(empty)\n", indent);
1223 1225
1224 return buf; 1226 return buf;
1225} 1227}
… …
1357 * Supposed to fix face-values as well here, but later. 1359 * Supposed to fix face-values as well here, but later.
1358 */ 1360 */
1359void 1361void
1360identify (object *op) 1362identify (object *op)
1361{ 1363{
1362 object *pl;
1363
1364 SET_FLAG (op, FLAG_IDENTIFIED); 1364 SET_FLAG (op, FLAG_IDENTIFIED);
1365 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1365 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1366 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1366 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1367 1367
1368 /* 1368 /*
… …
1375 { 1375 {
1376 if (op->inv && op->randomitems) 1376 if (op->inv && op->randomitems)
1377 op->title = op->inv->name; 1377 op->title = op->inv->name;
1378 else if (op->arch) 1378 else if (op->arch)
1379 { 1379 {
1380 op->name = op->arch->object::name; 1380 op->name = op->arch->object::name;
1381 op->name_pl = op->arch->object::name_pl; 1381 op->name_pl = op->arch->object::name_pl;
1382 } 1382 }
1383 } 1383 }
1384 1384
1385 /* If the object is on a map, make sure we update its face */ 1385 /* If the object is on a map, make sure we update its face */
1386 if (op->map) 1386 if (op->map)
1387 update_object (op, UP_OBJ_CHANGE); 1387 update_object (op, UP_OBJ_CHANGE);
1388 else 1388
1389 { 1389 if (object *pl = op->visible_to ())
1390 pl = op->in_player ();
1391 if (pl)
1392 /* A lot of the values can change from an update - might as well send 1390 /* A lot of the values can change from an update - might as well send
1393 * it all. 1391 * it all.
1394 */ 1392 */
1395 esrv_send_item (pl, op); 1393 esrv_send_item (pl, op);
1396 }
1397} 1394}
1398 1395

Diff Legend

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