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.27 by root, Mon Apr 23 18:21:54 2007 UTC vs.
Revision 1.38 by root, Sun Jul 1 05:00:17 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27#include <living.h> 26#include <living.h>
… …
47 * may be better. 46 * may be better.
48 * Basically, for the use/nonuse, the code does something like: 47 * Basically, for the use/nonuse, the code does something like:
49 * "This item goes %s\n", with the use/nonuse values filling in the %s 48 * "This item goes %s\n", with the use/nonuse values filling in the %s
50 */ 49 */
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 50Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {"body_range", "in your range slot", "in a human's range slot"}, 51 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
53 {"body_arm", "on your arm", "on a human's arm"}, 52 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
54 {"body_torso", "on your body", "on a human's torso"}, 53 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
55 {"body_head", "on your head", "on a human's head"}, 54 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
56 {"body_neck", "around your neck", "around a humans neck"}, 55 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
57 {"body_skill", "in your skill slot", "in a human's skill slot"}, 56 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
58 {"body_finger", "on your finger", "on a human's finger"} , 57 {KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
58 {KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
59 {KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
59 {"body_shoulder", "around your shoulders", "around a human's shoulders"}, 60 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
60 {"body_foot", "on your feet", "on a human's feet"}, 61 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
61 {"body_hand", "on your hands", "on a human's hands"}, 62 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
62 {"body_wrist", "around your wrists", "around a human's wrist"}, 63 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
63 {"body_waist", "around your waist", "around a human's waist"}, 64 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
64/*{"body_dragon_torso", "your body", "a dragon's body"} */ 65/*{"body_dragon_torso", "your body", "a dragon's body"} */
65}; 66};
66 67
67static char numbers[21][20] = { 68static char numbers[21][20] = {
68 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", 69 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
… …
270{ 271{
271 int i, tmp, enc; 272 int i, tmp, enc;
272 273
273 enc = 0; 274 enc = 0;
274 for (i = 0; i < NUM_STATS; i++) 275 for (i = 0; i < NUM_STATS; i++)
275 enc += get_attr_value (&op->stats, i); 276 enc += op->stats.stat (i);
276 277
277 /* This protection logic is pretty flawed. 20% fire resistance 278 /* This protection logic is pretty flawed. 20% fire resistance
278 * is much more valuable than 20% confusion, or 20% slow, or 279 * is much more valuable than 20% confusion, or 20% slow, or
279 * several others. Start at 1 - ignore physical - all that normal 280 * several others. Start at 1 - ignore physical - all that normal
280 * armour shouldn't be counted against 281 * armour shouldn't be counted against
… …
500 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 501 if (!QUERY_FLAG (op, FLAG_IDENTIFIED))
501 return buf; 502 return buf;
502 503
503 for (attr = 0; attr < NUM_STATS; attr++) 504 for (attr = 0; attr < NUM_STATS; attr++)
504 { 505 {
505 if ((val = get_attr_value (&(op->stats), attr)) != 0) 506 if ((val = op->stats.stat (attr)))
506 {
507 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 507 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);
508 }
509 } 508 }
510 509
511 if (op->stats.exp) 510 if (op->stats.exp)
512 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 511 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
513 if (op->stats.wc) 512 if (op->stats.wc)
… …
712 { 711 {
713 case BOW: 712 case BOW:
714 case WAND: 713 case WAND:
715 case ROD: 714 case ROD:
716 case HORN: 715 case HORN:
717 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 716 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF);
718 break; 717 break;
719 case WEAPON: 718 case WEAPON:
720 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 719 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF);
721 break; 720 break;
722 case ARMOUR: 721 case ARMOUR:
723 case HELMET: 722 case HELMET:
724 case SHIELD: 723 case SHIELD:
725 case RING: 724 case RING:
… …
771 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 770 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
772 mt = name_to_material (op->materialname); 771 mt = name_to_material (op->materialname);
773 772
774#ifdef NEW_MATERIAL_CODE 773#ifdef NEW_MATERIAL_CODE
775 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt && 774 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
776 op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL)) 775 op->arch->materialname != mt->name && !(op->material & M_SPECIAL))
777 { 776 {
778 strcpy (buf, mt->description); 777 strcpy (buf, mt->description);
779 len = strlen (buf); 778 len = strlen (buf);
780 safe_strcat (buf, " ", &len, MAX_BUF); 779 safe_strcat (buf, " ", &len, MAX_BUF);
781 if (!plural) 780 if (!plural)
… …
840 safe_strcat (buf, " ", &len, MAX_BUF); 839 safe_strcat (buf, " ", &len, MAX_BUF);
841 safe_strcat (buf, s, &len, MAX_BUF); 840 safe_strcat (buf, s, &len, MAX_BUF);
842 } 841 }
843 } 842 }
844 break; 843 break;
844
845 default: 845 default:
846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
847 {
848 sprintf (buf + strlen (buf), " %+d", op->magic); 847 sprintf (buf + strlen (buf), " %+d", op->magic);
849 }
850 } 848 }
851 849
852 return buf; 850 return buf;
853} 851}
854 852
… …
935 { 933 {
936 treasure *t; 934 treasure *t;
937 int first = 1; 935 int first = 1;
938 936
939 for (t = op->randomitems->items; t != NULL; t = t->next) 937 for (t = op->randomitems->items; t != NULL; t = t->next)
940 if (t->item && t->item->clone.type == SPELL) 938 if (t->item && t->item->type == SPELL)
941 { 939 {
942 if (first) 940 if (first)
943 { 941 {
944 first = 0; 942 first = 0;
945 strcat (retbuf, "(Spell abilities:)"); 943 strcat (retbuf, "(Spell abilities:)");
946 } 944 }
947 strcat (retbuf, "("); 945 strcat (retbuf, "(");
948 strcat (retbuf, t->item->clone.name); 946 strcat (retbuf, t->item->object::name);
949 strcat (retbuf, ")"); 947 strcat (retbuf, ")");
950 } 948 }
951 } 949 }
952 if (op->type == PLAYER) 950 if (op->type == PLAYER)
953 { 951 {
… …
1083 break; /* We have more information to do below this switch */ 1081 break; /* We have more information to do below this switch */
1084 1082
1085 case POWER_CRYSTAL: 1083 case POWER_CRYSTAL:
1086 if (op->stats.maxsp > 1000) 1084 if (op->stats.maxsp > 1000)
1087 { /*higher capacity crystals */ 1085 { /*higher capacity crystals */
1088 i = (op->stats.maxsp % 100) / 10; 1086 i = (op->stats.maxsp % 1000) / 100;
1087
1089 if (i) 1088 if (i)
1090 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i); 1089 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1091 else 1090 else
1092 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100); 1091 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000);
1093 } 1092 }
1094 else 1093 else
1095 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 1094 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp);
1095
1096 strcat (retbuf, buf); 1096 strcat (retbuf, buf);
1097 i = (op->stats.sp * 10) / op->stats.maxsp; 1097 i = (op->stats.sp * 10) / op->stats.maxsp;
1098 if (op->stats.sp == 0) 1098 if (op->stats.sp == 0)
1099 strcat (retbuf, "empty."); 1099 strcat (retbuf, "empty.");
1100 else if (i == 0) 1100 else if (i == 0)
… …
1165 { 1165 {
1166 int attr, val; 1166 int attr, val;
1167 1167
1168 for (attr = 0; attr < NUM_STATS; attr++) 1168 for (attr = 0; attr < NUM_STATS; attr++)
1169 { 1169 {
1170 if ((val = get_attr_value (&(op->stats), attr)) != 0) 1170 if ((val = op->stats.stat (attr)))
1171 { 1171 {
1172 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1172 sprintf (buf, "(%s%+d)", short_stat_name[attr], val);
1173 strcat (retbuf, buf); 1173 strcat (retbuf, buf);
1174 } 1174 }
1175 } 1175 }
… …
1432 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1432 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1433 return 1; 1433 return 1;
1434 1434
1435 /* Check to see if it increases/decreases any stats */ 1435 /* Check to see if it increases/decreases any stats */
1436 for (i = 0; i < NUM_STATS; i++) 1436 for (i = 0; i < NUM_STATS; i++)
1437 if (get_attr_value (&(op->stats), i) != 0) 1437 if (op->stats.stat (i))
1438 return 1; 1438 return 1;
1439 1439
1440 /* If it doesn't fall into any of the above categories, must 1440 /* If it doesn't fall into any of the above categories, must
1441 * be non magical. 1441 * be non magical.
1442 */ 1442 */
… …
1451int 1451int
1452need_identify (const object *op) 1452need_identify (const object *op)
1453{ 1453{
1454 switch (op->type) 1454 switch (op->type)
1455 { 1455 {
1456 case RING: 1456 case RING:
1457 case WAND: 1457 case WAND:
1458 case ROD: 1458 case ROD:
1459 case HORN: 1459 case HORN:
1460 case SCROLL: 1460 case SCROLL:
1461 case SKILL: 1461 case SKILL:
1462 case SKILLSCROLL: 1462 case SKILLSCROLL:
1463 case SPELLBOOK: 1463 case SPELLBOOK:
1464 case FOOD: 1464 case FOOD:
1465 case POTION: 1465 case POTION:
1466 case BOW: 1466 case BOW:
1467 case ARROW: 1467 case ARROW:
1468 case WEAPON: 1468 case WEAPON:
1469 case ARMOUR: 1469 case ARMOUR:
1470 case SHIELD: 1470 case SHIELD:
1471 case HELMET: 1471 case HELMET:
1472 case AMULET: 1472 case AMULET:
1473 case BOOTS: 1473 case BOOTS:
1474 case GLOVES: 1474 case GLOVES:
1475 case BRACERS: 1475 case BRACERS:
1476 case GIRDLE: 1476 case GIRDLE:
1477 case CONTAINER: 1477 case CONTAINER:
1478 case DRINK: 1478 case DRINK:
1479 case FLESH: 1479 case FLESH:
1480 case INORGANIC: 1480 case INORGANIC:
1481 case CLOSE_CON: 1481 case CLOSE_CON:
1482 case CLOAK: 1482 case CLOAK:
1483 case GEM: 1483 case GEM:
1484 case POWER_CRYSTAL: 1484 case POWER_CRYSTAL:
1485 case POISON: 1485 case POISON:
1486 case BOOK: 1486 case BOOK:
1487 case SKILL_TOOL: 1487 case SKILL_TOOL:
1488 return 1; 1488 return 1;
1489 } 1489 }
1490
1490 /* Try to track down some stuff that may show up here. Thus, the 1491 /* Try to track down some stuff that may show up here. Thus, the
1491 * archetype file can be updated, and this function removed. 1492 * archetype file can be updated, and this function removed.
1492 */ 1493 */
1493#if 0 1494#if 0
1494 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name); 1495 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
… …
1518 { 1519 {
1519 if (op->inv && op->randomitems) 1520 if (op->inv && op->randomitems)
1520 op->title = op->inv->name; 1521 op->title = op->inv->name;
1521 else if (op->arch) 1522 else if (op->arch)
1522 { 1523 {
1523 op->name = op->arch->clone.name; 1524 op->name = op->arch->object::name;
1524 op->name_pl = op->arch->clone.name_pl; 1525 op->name_pl = op->arch->object::name_pl;
1525 } 1526 }
1526 } 1527 }
1527 1528
1528 /* If the object is on a map, make sure we update its face */ 1529 /* If the object is on a map, make sure we update its face */
1529 if (op->map) 1530 if (op->map)

Diff Legend

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