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.55 by root, Wed Sep 16 22:50:50 2009 UTC vs.
Revision 1.64 by root, Fri Nov 6 13:31:47 2009 UTC

… …
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
69static 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
75static char numbers_10[10][20] = { 70static 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
211const int item_types_size = sizeof (item_types) / sizeof (*item_types); 206static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
212 207
213materialtype_t *materialt; 208materialtype_t *materialt;
214 209
215/* 210/*
216materialtype material[NROFMATERIALS] = { 211materialtype material[NROFMATERIALS] = {
… …
380 * 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
381 */ 376 */
382const char * 377const char *
383describe_resistance (const object *op, int newline) 378describe_resistance (const object *op, int newline)
384{ 379{
385 static char buf[VERY_BIG_BUF]; 380 static dynbuf_text buf; buf.clear ();
386 char buf1[VERY_BIG_BUF];
387 int tmpvar;
388 381
389 buf[0] = 0; 382 for (int i = 0; i < NROFATTACKS; i++)
390 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
391 {
392 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))
393 { 384 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
394 if (!newline)
395 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
396 else
397 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
398
399 strcat (buf, buf1);
400 }
401 }
402 385
403 return buf; 386 return buf;
404} 387}
405
406 388
407/* 389/*
408 * query_weight(object) returns a character pointer to a static buffer 390 * query_weight(object) returns a character pointer to a static buffer
409 * containing the text-representation of the weight of the given object. 391 * containing the text-representation of the weight of the given object.
410 * 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().
… …
450 return levelnumbers_10[i / 10]; 432 return levelnumbers_10[i / 10];
451 433
452 strcpy (buf, numbers_10[i / 10]); 434 strcpy (buf, numbers_10[i / 10]);
453 strcat (buf, levelnumbers[i % 10]); 435 strcat (buf, levelnumbers[i % 10]);
454 return buf; 436 return buf;
455}
456
457/*
458 * get_number(integer) returns the text-representation of the given number
459 * in a static buffer. The buffer might be overwritten at the next
460 * call to get_number().
461 * It is currently only used by the query_name() function.
462 */
463const char *
464get_number (int i)
465{
466 if (i <= 20)
467 return numbers[i];
468 else
469 {
470 static char buf[MAX_BUF];
471
472 sprintf (buf, "%d", i);
473 return buf;
474 }
475} 437}
476 438
477/* 439/*
478 * Returns pointer to static buffer containing ring's or amulet's 440 * Returns pointer to static buffer containing ring's or amulet's
479 * abilities 441 * abilities
… …
485 */ 447 */
486 448
487/* 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
488 * from stats.sp - b.t. 450 * from stats.sp - b.t.
489 */ 451 */
490const char * 452static const char *
491ring_desc (const object *op) 453ring_desc (const object *op)
492{ 454{
493 static dynbuf_text buf; buf.clear (); 455 static dynbuf_text buf; buf.clear ();
494 int attr, val, len; 456 int attr, val, len;
495 457
… …
648 610
649 buf << query_short_name (op); 611 buf << query_short_name (op);
650 612
651 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 613 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
652 buf << " *"; 614 buf << " *";
653 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 615 if (op->is_open_container ())
654 buf << " (open)"; 616 buf << " (open)";
655 617
656 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 618 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
657 { 619 {
658 if (QUERY_FLAG (op, FLAG_DAMNED)) 620 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
1207 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 1169 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
1208 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1209 1171
1210 if (op->slaying && op->type != FOOD) 1172 if (op->slaying && op->type != FOOD)
1211 buf.printf ("(slay %s)", &op->slaying); 1173 buf.printf ("(slay %s)", &op->slaying);
1174
1175 if (op->type == SKILL_TOOL && op->skill)
1176 buf.printf ("(%s)", &op->skill);
1212 1177
1213 buf.add_abilities ("Attacks", op->attacktype); 1178 buf.add_abilities ("Attacks", op->attacktype);
1214 /* resistance on flesh is only visible for quetzals. If 1179 /* resistance on flesh is only visible for quetzals. If
1215 * non flesh, everyone can see its resistances 1180 * non flesh, everyone can see its resistances
1216 */ 1181 */

Diff Legend

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