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.60 by root, Thu Oct 15 20:12:35 2009 UTC vs.
Revision 1.71 by root, Wed Mar 24 17:23:43 2010 UTC

… …
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"
… …
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
214materialtype_t *materialt;
215
216/*
217materialtype material[NROFMATERIALS] = {
218 * P M F E C C A D W G P S P T F C D D C C G H B I *
219 * H A I L O O C R E H O L A U E A E E H O O O L N *
220 * Y G R E L N I A A O I O R R A N P A A U D L I T *
221 * S I E C D F D I P S S W A N R C L T O N Y N R *
222 * I C T U N O T O L E E H S T P D N *
223 {"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}},
224 {"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}},
225 {"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}},
226 {"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}},
227 {"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}},
228 {"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}},
229 {"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}},
230 {"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}},
231 {"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}},
232 {"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}},
233 {"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}},
234 {"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}},
235 {"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}}
236};
237*/
238 207
239/* 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
240 * 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
241 * wear whatever they want with no worries. Perhaps having the steep 210 * wear whatever they want with no worries. Perhaps having the steep
242 * curve is good (maybe even steeper), but allowing players to 211 * curve is good (maybe even steeper), but allowing players to
… …
319 288
320 enc += op->stats.luck; 289 enc += op->stats.luck;
321 290
322 /* Do spell paths now */ 291 /* Do spell paths now */
323 for (i = 1; i < NRSPELLPATHS; i++) 292 for (i = 1; i < NRSPELLPATHS; i++)
324 {
325 if (op->path_attuned & (1 << i)) 293 if (op->path_attuned & (1 << i))
326 enc++; 294 enc++;
327 else if (op->path_denied & (1 << i)) 295 else if (op->path_denied & (1 << i))
328 enc -= 2; 296 enc -= 2;
329 else if (op->path_repelled & (1 << i)) 297 else if (op->path_repelled & (1 << i))
330 enc--; 298 enc--;
331 }
332 299
333 if (op->flag [FLAG_LIFESAVE ]) enc += 5; 300 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
334 if (op->flag [FLAG_REFL_SPELL ]) enc += 3; 301 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
335 if (op->flag [FLAG_REFL_MISSILE]) enc += 2; 302 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
336 if (op->flag [FLAG_XRAYS ]) enc += 2; 303 if (op->flag [FLAG_XRAYS ]) enc += 2;
… …
390 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]); 357 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
391 358
392 return buf; 359 return buf;
393} 360}
394 361
395
396/* 362/*
397 * query_weight(object) returns a character pointer to a static buffer 363 * query_weight(object) returns a character pointer to a static buffer
398 * containing the text-representation of the weight of the given object. 364 * containing the text-representation of the weight of the given object.
399 * 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().
400 * 366 *
… …
439 return levelnumbers_10[i / 10]; 405 return levelnumbers_10[i / 10];
440 406
441 strcpy (buf, numbers_10[i / 10]); 407 strcpy (buf, numbers_10[i / 10]);
442 strcat (buf, levelnumbers[i % 10]); 408 strcat (buf, levelnumbers[i % 10]);
443 return buf; 409 return buf;
444}
445
446/*
447 * get_number(integer) returns the text-representation of the given number
448 * in a static buffer. The buffer might be overwritten at the next
449 * call to get_number().
450 * It is currently only used by the query_name() function.
451 */
452const char *
453get_number (int i)
454{
455 if (i <= 20)
456 return numbers[i];
457 else
458 {
459 static char buf[MAX_BUF];
460
461 sprintf (buf, "%d", i);
462 return buf;
463 }
464} 410}
465 411
466/* 412/*
467 * Returns pointer to static buffer containing ring's or amulet's 413 * Returns pointer to static buffer containing ring's or amulet's
468 * abilities 414 * abilities
… …
474 */ 420 */
475 421
476/* 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
477 * from stats.sp - b.t. 423 * from stats.sp - b.t.
478 */ 424 */
479const char * 425static const char *
480ring_desc (const object *op) 426ring_desc (const object *op)
481{ 427{
482 static dynbuf_text buf; buf.clear (); 428 static dynbuf_text buf; buf.clear ();
483 int attr, val, len; 429 int attr, val, len;
484 430
… …
615 * returned is good forever.) However, it makes printing statements that 561 * returned is good forever.) However, it makes printing statements that
616 * 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.)
617 * 563 *
618 * 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
619 * and short description of the item. 565 * and short description of the item.
566 * It is also used by examine/ex and similar functions.
620 */ 567 */
621const char * 568const char *
622query_name (const object *op) 569query_name (const object *op)
623{ 570{
624 int len = 0; 571 int len = 0;
… …
629 use_buf %= 5; 576 use_buf %= 5;
630 577
631 dynbuf_text &buf = bufs [use_buf]; 578 dynbuf_text &buf = bufs [use_buf];
632 buf.clear (); 579 buf.clear ();
633 580
581#if 0
634 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 582 if ((op->is_armor () || op->is_weapon ()) && op->material)
635 if (materialtype_t *mt = name_to_material (op->materialname))
636 buf << mt->description << ' '; 583 buf << op->material->description << ' ';
584#endif
637 585
638 buf << query_short_name (op); 586 buf << query_short_name (op);
639 587
640 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 588 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
641 buf << " *"; 589 buf << " *";
642 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 590 if (op->is_open_container ())
643 buf << " (open)"; 591 buf << " (open)";
644 592
645 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 593 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
646 { 594 {
647 if (QUERY_FLAG (op, FLAG_DAMNED)) 595 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
739 * and sending to client. 687 * and sending to client.
740 * If plural is set, we generate the plural name of this. 688 * If plural is set, we generate the plural name of this.
741 * 689 *
742 * 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,
743 * 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.
744 */ 693 */
745const char * 694const char *
746query_base_name (const object *op, int plural) 695query_base_name (const object *op, int plural)
747{ 696{
748 if ((!plural && !op->name) || (plural && !op->name_pl)) 697 if ((!plural && !op->name) || (plural && !op->name_pl))
749 return "(null)"; 698 return "(null)";
750 699
751 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)
752 return op->name; /* To speed things up (or make things slower?) */ 702 return op->name; /* To speed things up (or make things slower?) */
753 703
754 static dynbuf_text buf; buf.clear (); 704 static dynbuf_text buf; buf.clear ();
755 705
706#if 0
756 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 707 if ((op->is_armor () || op->is_weapon ()) && op->material)
757 if (materialtype_t *mt = name_to_material (op->materialname))
758 if (op->arch->materialname != mt->name) 708 if (op->arch->material != op->material)
759 buf << mt->description << ' '; 709 buf << op->material->description << ' ';
710#endif
760 711
761 buf << (plural ? op->name_pl : op->name); 712 buf << (plural ? op->name_pl : op->name);
762 713
763 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 714 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
764 buf << ' ' << op->title; 715 buf << ' ' << op->title;
… …
815 /* Note that the resolution this provides for players really isn't 766 /* Note that the resolution this provides for players really isn't
816 * very good. Any player with a speed greater than .67 will 767 * very good. Any player with a speed greater than .67 will
817 * fall into the 'lightning fast movement' category. 768 * fall into the 'lightning fast movement' category.
818 */ 769 */
819 if (op->has_active_speed ()) 770 if (op->has_active_speed ())
820 switch ((int) ((FABS (op->speed)) * 15)) 771 switch ((int)(op->speed * 15.))
821 { 772 {
822 case 0: 773 case 0:
823 buf << "(very slow movement)"; 774 buf << "(very slow movement)";
824 break; 775 break;
825 case 1: 776 case 1:
… …
895 if (op->stats.luck) 846 if (op->stats.luck)
896 buf.printf ("(luck%+d)", op->stats.luck); 847 buf.printf ("(luck%+d)", op->stats.luck);
897 } 848 }
898 849
899 /* describe attacktypes */ 850 /* describe attacktypes */
900 if (is_dragon_pl (op)) 851 if (op->is_dragon ())
901 { 852 {
902 /* for dragon players display the attacktypes from clawing skill 853 /* for dragon players display the attacktypes from clawing skill
903 * Break apart the for loop - move the comparison checking down - 854 * Break apart the for loop - move the comparison checking down -
904 * this makes it more readable. 855 * this makes it more readable.
905 */ 856 */
… …
1204 1155
1205 buf.add_abilities ("Attacks", op->attacktype); 1156 buf.add_abilities ("Attacks", op->attacktype);
1206 /* resistance on flesh is only visible for quetzals. If 1157 /* resistance on flesh is only visible for quetzals. If
1207 * non flesh, everyone can see its resistances 1158 * non flesh, everyone can see its resistances
1208 */ 1159 */
1209 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1160 if (op->type != FLESH || (owner && owner->is_dragon ()))
1210 buf << describe_resistance (op, 0); 1161 buf << describe_resistance (op, 0);
1211 1162
1212 buf.add_paths ("Attuned", op->path_attuned); 1163 buf.add_paths ("Attuned", op->path_attuned);
1213 buf.add_paths ("Repelled", op->path_repelled); 1164 buf.add_paths ("Repelled", op->path_repelled);
1214 buf.add_paths ("Denied", op->path_denied); 1165 buf.add_paths ("Denied", op->path_denied);
… …
1241{ 1192{
1242 static dynbuf_text buf; buf.clear (); 1193 static dynbuf_text buf; buf.clear ();
1243 1194
1244 for (object *tmp = inv; tmp; tmp = tmp->below) 1195 for (object *tmp = inv; tmp; tmp = tmp->below)
1245 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1196 if (who && QUERY_FLAG (who, FLAG_WIZ))
1246 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ()); 1197 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1247 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1198 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1248 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ()); 1199 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1249 1200
1250 if (buf.size ()) 1201 if (buf.size ())
1251 buf.printf ("%s(total weight: %s)\n", indent, query_weight ()); 1202 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());

Diff Legend

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