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.58 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.66 by root, Sun Nov 8 20:55:39 2009 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"
… …
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] = {
… …
319 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 (op->flag [FLAG_LIFESAVE ]) enc += 5; 325 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
334 if (op->flag [FLAG_REFL_SPELL ]) enc += 3; 326 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
335 if (op->flag [FLAG_REFL_MISSILE]) enc += 2; 327 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
336 if (op->flag [FLAG_XRAYS ]) enc += 2; 328 if (op->flag [FLAG_XRAYS ]) enc += 2;
… …
381 * 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
382 */ 374 */
383const char * 375const char *
384describe_resistance (const object *op, int newline) 376describe_resistance (const object *op, int newline)
385{ 377{
386 static char buf[VERY_BIG_BUF]; 378 static dynbuf_text buf; buf.clear ();
387 char buf1[VERY_BIG_BUF];
388 int tmpvar;
389 379
390 buf[0] = 0; 380 for (int i = 0; i < NROFATTACKS; i++)
391 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
392 {
393 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))
394 { 382 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
395 if (!newline)
396 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
397 else
398 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
399
400 strcat (buf, buf1);
401 }
402 }
403 383
404 return buf; 384 return buf;
405} 385}
406
407 386
408/* 387/*
409 * query_weight(object) returns a character pointer to a static buffer 388 * query_weight(object) returns a character pointer to a static buffer
410 * containing the text-representation of the weight of the given object. 389 * containing the text-representation of the weight of the given object.
411 * 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().
… …
451 return levelnumbers_10[i / 10]; 430 return levelnumbers_10[i / 10];
452 431
453 strcpy (buf, numbers_10[i / 10]); 432 strcpy (buf, numbers_10[i / 10]);
454 strcat (buf, levelnumbers[i % 10]); 433 strcat (buf, levelnumbers[i % 10]);
455 return buf; 434 return buf;
456}
457
458/*
459 * get_number(integer) returns the text-representation of the given number
460 * in a static buffer. The buffer might be overwritten at the next
461 * call to get_number().
462 * It is currently only used by the query_name() function.
463 */
464const char *
465get_number (int i)
466{
467 if (i <= 20)
468 return numbers[i];
469 else
470 {
471 static char buf[MAX_BUF];
472
473 sprintf (buf, "%d", i);
474 return buf;
475 }
476} 435}
477 436
478/* 437/*
479 * Returns pointer to static buffer containing ring's or amulet's 438 * Returns pointer to static buffer containing ring's or amulet's
480 * abilities 439 * abilities
… …
486 */ 445 */
487 446
488/* 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
489 * from stats.sp - b.t. 448 * from stats.sp - b.t.
490 */ 449 */
491const char * 450static const char *
492ring_desc (const object *op) 451ring_desc (const object *op)
493{ 452{
494 static dynbuf_text buf; buf.clear (); 453 static dynbuf_text buf; buf.clear ();
495 int attr, val, len; 454 int attr, val, len;
496 455
… …
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))
… …
827 /* Note that the resolution this provides for players really isn't 786 /* Note that the resolution this provides for players really isn't
828 * very good. Any player with a speed greater than .67 will 787 * very good. Any player with a speed greater than .67 will
829 * fall into the 'lightning fast movement' category. 788 * fall into the 'lightning fast movement' category.
830 */ 789 */
831 if (op->has_active_speed ()) 790 if (op->has_active_speed ())
832 switch ((int) ((FABS (op->speed)) * 15)) 791 switch ((int)((fabs (op->speed)) * 15.))
833 { 792 {
834 case 0: 793 case 0:
835 buf << "(very slow movement)"; 794 buf << "(very slow movement)";
836 break; 795 break;
837 case 1: 796 case 1:

Diff Legend

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