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.13 by elmex, Wed Dec 20 13:07:12 2006 UTC vs.
Revision 1.21 by root, Mon Feb 5 01:39:05 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h> 26#include <funcpoint.h>
26#include <living.h> 27#include <living.h>
27#include <spells.h> 28#include <spells.h>
… …
161 {LIGHTER, "lighter", "lighters", 0, 0}, 162 {LIGHTER, "lighter", "lighters", 0, 0},
162 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 163 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
163 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 164 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
164 {LAMP, "lamp", "lamps", 0, 0}, 165 {LAMP, "lamp", "lamps", 0, 0},
165 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 166 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
166 {TOOL, "tool", "tools", 0, 0},
167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
168 {BUILDFAC, "building facility", "building facilities", 0, 0},
169 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 168 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
170 {SPINNER, "spinner", "spinners", 0, 0}, 169 {SPINNER, "spinner", "spinners", 0, 0},
171 {GATE, "gate", "gates", 0, 0}, 170 {GATE, "gate", "gates", 0, 0},
172 {BUTTON, "button", "buttons", 0, 0}, 171 {BUTTON, "button", "buttons", 0, 0},
173 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 172 {CF_HANDLE, "cf handle", "cf handles", 0, 0},
… …
180 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0}, 179 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
181 {CONVERTER, "converter", "converters", 0, 0}, 180 {CONVERTER, "converter", "converters", 0, 0},
182 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0}, 181 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
183 {POISONING, "poisoning", "poisonings", 0, 0}, 182 {POISONING, "poisoning", "poisonings", 0, 0},
184 {SAVEBED, "savebed", "savebeds", 0, 0}, 183 {SAVEBED, "savebed", "savebeds", 0, 0},
185 {POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
186 {FIREHOLES, "fireholes", "fireholes", 0, 0},
187 {WAND, "wand", "wands", SK_THAUMATURGY, 0}, 184 {WAND, "wand", "wands", SK_THAUMATURGY, 0},
188 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0}, 185 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
189 {DIRECTOR, "director", "directors", 0, 0}, 186 {DIRECTOR, "director", "directors", 0, 0},
190 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0}, 187 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
191 {FORCE, "force", "forces", 0, 0}, 188 {FORCE, "force", "forces", 0, 0},
… …
788 } 785 }
789 else 786 else
790 { 787 {
791#endif 788#endif
792 if (!plural) 789 if (!plural)
793 strcpy (buf, op->name); 790 assign (buf, op->name);
794 else 791 else
795 strcpy (buf, op->name_pl); 792 assign (buf, op->name_pl);
793
796 len = strlen (buf); 794 len = strlen (buf);
797#ifdef NEW_MATERIAL_CODE 795#ifdef NEW_MATERIAL_CODE
798 } 796 }
799#endif 797#endif
800 798
… …
804 safe_strcat (buf, op->title, &len, MAX_BUF); 802 safe_strcat (buf, op->title, &len, MAX_BUF);
805 } 803 }
806 804
807 switch (op->type) 805 switch (op->type)
808 { 806 {
809 case SPELLBOOK: 807 case SPELLBOOK:
810 case SCROLL: 808 case SCROLL:
811 case WAND: 809 case WAND:
812 case ROD: 810 case ROD:
813 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 811 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
814 { 812 {
815 if (!op->title) 813 if (!op->title)
816 { 814 {
817 safe_strcat (buf, " of ", &len, MAX_BUF); 815 safe_strcat (buf, " of ", &len, MAX_BUF);
818 if (op->inv) 816 if (op->inv)
819 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 817 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
820 else 818 else
821 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 819 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
822 } 820 }
823 if (op->type != SPELLBOOK) 821 if (op->type != SPELLBOOK)
824 { 822 {
825 sprintf (buf2, " (lvl %d)", op->level); 823 sprintf (buf2, " (lvl %d)", op->level);
826 safe_strcat (buf, buf2, &len, MAX_BUF); 824 safe_strcat (buf, buf2, &len, MAX_BUF);
827 } 825 }
828 } 826 }
829 break; 827 break;
830 828
831 829
832 case SKILL: 830 case SKILL:
833 case AMULET: 831 case AMULET:
834 case RING: 832 case RING:
835 if (!op->title) 833 if (!op->title)
836 { 834 {
837 /* If ring has a title, full description isn't so useful */ 835 /* If ring has a title, full description isn't so useful */
838 char *s = ring_desc (op); 836 char *s = ring_desc (op);
839 837
840 if (s[0]) 838 if (s[0])
841 { 839 {
842 safe_strcat (buf, " ", &len, MAX_BUF); 840 safe_strcat (buf, " ", &len, MAX_BUF);
843 safe_strcat (buf, s, &len, MAX_BUF); 841 safe_strcat (buf, s, &len, MAX_BUF);
844 } 842 }
845 } 843 }
846 break; 844 break;
847 default: 845 default:
848 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)))
849 { 847 {
850 sprintf (buf + strlen (buf), " %+d", op->magic); 848 sprintf (buf + strlen (buf), " %+d", op->magic);
851 } 849 }
852 } 850 }
851
853 return buf; 852 return buf;
854} 853}
855 854
856/* Break this off from describe_item - that function was way 855/* Break this off from describe_item - that function was way
857 * too long, making it difficult to read. This function deals 856 * too long, making it difficult to read. This function deals
858 * with describing the monsters & players abilities. It should only 857 * with describing the monsters & players abilities. It should only
859 * be called with monster & player objects. Returns a description 858 * be called with monster & player objects. Returns a description
860 * in a static buffer. 859 * in a static buffer.
861 */ 860 */
862
863static char * 861static char *
864describe_monster (const object *op) 862describe_monster (const object *op)
865{ 863{
866 char buf[MAX_BUF]; 864 char buf[MAX_BUF];
867 static char retbuf[VERY_BIG_BUF]; 865 static char retbuf[VERY_BIG_BUF];
… …
871 869
872 /* Note that the resolution this provides for players really isn't 870 /* Note that the resolution this provides for players really isn't
873 * very good. Any player with a speed greater than .67 will 871 * very good. Any player with a speed greater than .67 will
874 * fall into the 'lightning fast movement' category. 872 * fall into the 'lightning fast movement' category.
875 */ 873 */
876 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 874 if (op->has_active_speed ())
877 { 875 {
878 switch ((int) ((FABS (op->speed)) * 15)) 876 switch ((int) ((FABS (op->speed)) * 15))
879 { 877 {
880 case 0: 878 case 0:
881 strcat (retbuf, "(very slow movement)"); 879 strcat (retbuf, "(very slow movement)");
… …
937 { 935 {
938 treasure *t; 936 treasure *t;
939 int first = 1; 937 int first = 1;
940 938
941 for (t = op->randomitems->items; t != NULL; t = t->next) 939 for (t = op->randomitems->items; t != NULL; t = t->next)
942 if (t->item && (t->item->clone.type == SPELL)) 940 if (t->item && t->item->clone.type == SPELL)
943 { 941 {
944 if (first) 942 if (first)
945 { 943 {
946 first = 0; 944 first = 0;
947 strcat (retbuf, "(Spell abilities:)"); 945 strcat (retbuf, "(Spell abilities:)");
… …
993 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 991 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
994 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 992 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
995 break; 993 break;
996 994
997 if (tmp && tmp->attacktype != 0) 995 if (tmp && tmp->attacktype != 0)
998 {
999 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws"); 996 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");
1000 }
1001 else 997 else
1002 {
1003 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 998 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1004 }
1005 } 999 }
1006 else 1000 else
1007 {
1008 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1001 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1009 } 1002
1010 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 1003 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1011 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 1004 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1012 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 1005 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1013 for (i = 0; i < NROFATTACKS; i++) 1006 for (i = 0; i < NROFATTACKS; i++)
1014 { 1007 {

Diff Legend

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