ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/treasure.C
(Generate patch)

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.61 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.87 by sf-marcmagus, Thu Oct 15 16:00:37 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 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 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 26 * It is useful for finding bugs in the treasures file. Since it only
27 * slows the startup some (and not actual game play), it is by default 27 * slows the startup some (and not actual game play), it is by default
… …
33 33
34//#define TREASURE_VERBOSE 34//#define TREASURE_VERBOSE
35 35
36#include <global.h> 36#include <global.h>
37#include <treasure.h> 37#include <treasure.h>
38#include <funcpoint.h>
39#include <loader.h> 38#include <loader.h>
40 39
41extern char *spell_mapping[]; 40extern char *spell_mapping[];
42 41
43static treasurelist *first_treasurelist; 42static treasurelist *first_treasurelist;
… …
47typedef std::tr1::unordered_map< 46typedef std::tr1::unordered_map<
48 const char *, 47 const char *,
49 treasurelist *, 48 treasurelist *,
50 str_hash, 49 str_hash,
51 str_equal, 50 str_equal,
52 slice_allocator< std::pair<const char *const, treasurelist *> >, 51 slice_allocator< std::pair<const char *const, treasurelist *> >
53 true
54> tl_map_t; 52> tl_map_t;
55 53
56static tl_map_t tl_map; 54static tl_map_t tl_map;
57 55
58/* 56/*
… …
140 138
141 f.next (); 139 f.next ();
142 140
143 for (;;) 141 for (;;)
144 { 142 {
145 coroapi::cede_to_tick_every (10); 143 coroapi::cede_to_tick ();
146 144
147 switch (f.kw) 145 switch (f.kw)
148 { 146 {
149 case KW_arch: 147 case KW_arch:
150 t->item = archetype::get (f.get_str ()); 148 t->item = archetype::find (f.get_str ());
149
150 if (!t->item)
151 {
152 f.parse_warn ("treasure references unknown archetype");
153 t->item = archetype::empty;
154 }
155
151 break; 156 break;
152 157
153 case KW_list: f.get (t->name); break; 158 case KW_list: f.get (t->name); break;
154 case KW_change_name: f.get (t->change_arch.name); break; 159 case KW_change_name: f.get (t->change_arch.name); break;
155 case KW_change_title: f.get (t->change_arch.title); break; 160 case KW_change_title: f.get (t->change_arch.title); break;
… …
169 t->next = read_treasure (f); 174 t->next = read_treasure (f);
170 return t; 175 return t;
171 176
172 default: 177 default:
173 if (!f.parse_error ("treasurelist", t->name)) 178 if (!f.parse_error ("treasurelist", t->name))
174 return 0; 179 goto error;
175 180
176 return t; 181 return t;
177 } 182 }
178 183
179 f.next (); 184 f.next ();
180 } 185 }
186
187 // not reached
188
189error:
190 delete t;
191 return 0;
181} 192}
182 193
183/* 194/*
184 * Each treasure is parsed with the help of load_treasure(). 195 * Each treasure is parsed with the help of load_treasure().
185 */ 196 */
… …
203 { 214 {
204 for (treasure *t = tl->items; t; t = t->next) 215 for (treasure *t = tl->items; t; t = t->next)
205 { 216 {
206 if (t->next_yes || t->next_no) 217 if (t->next_yes || t->next_no)
207 { 218 {
208 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 219 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
209 LOG (llevError, " the next_yes or next_no field is set\n"); 220 LOG (llevError, " the next_yes or next_no field is set\n");
210 } 221 }
211 222
212 tl->total_chance += t->chance; 223 tl->total_chance += t->chance;
213 } 224 }
… …
244 return; 255 return;
245 } 256 }
246 257
247 op->expand_tail (); 258 op->expand_tail ();
248 259
249 if (ob_blocked (op, creator->map, creator->x, creator->y)) 260 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
250 op->destroy (); 261 op->destroy ();
251 else 262 else
252 { 263 {
253 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 264 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
254 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 265 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
… …
258 { 269 {
259 op = creator->insert (op); 270 op = creator->insert (op);
260 271
261 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 272 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
262 monster_check_apply (creator, op); 273 monster_check_apply (creator, op);
263
264 if (flags & GT_UPDATE_INV)
265 if (object *tmp = creator->in_player ())
266 esrv_send_item (tmp, op);
267 } 274 }
268} 275}
269 276
270/* if there are change_xxx commands in the treasure, we include the changes 277/* if there are change_xxx commands in the treasure, we include the changes
271 * in the generated object 278 * in the generated object
… …
300 else 307 else
301 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); 308 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
302 } 309 }
303 else 310 else
304 { 311 {
305 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 312 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
306 { 313 {
307 object *tmp = arch_to_object (t->item); 314 object *tmp = arch_to_object (t->item);
308 315
309 if (t->nrof && tmp->nrof <= 1) 316 if (t->nrof && tmp->nrof <= 1)
310 tmp->nrof = rndm (t->nrof) + 1; 317 tmp->nrof = rndm (t->nrof) + 1;
… …
357 create_treasure (tl, op, flag, difficulty, tries); 364 create_treasure (tl, op, flag, difficulty, tries);
358 } 365 }
359 else if (t->nrof) 366 else if (t->nrof)
360 create_one_treasure (tl, op, flag, difficulty, tries); 367 create_one_treasure (tl, op, flag, difficulty, tries);
361 } 368 }
362 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 369 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
363 { 370 {
364 if (object *tmp = arch_to_object (t->item)) 371 if (object *tmp = arch_to_object (t->item))
365 { 372 {
366 if (t->nrof && tmp->nrof <= 1) 373 if (t->nrof && tmp->nrof <= 1)
367 tmp->nrof = rndm (t->nrof) + 1; 374 tmp->nrof = rndm (t->nrof) + 1;
… …
435 442
436 if (ob->inv) 443 if (ob->inv)
437 LOG (llevError, "In generate treasure, created multiple objects.\n"); 444 LOG (llevError, "In generate treasure, created multiple objects.\n");
438 445
439 ob->destroy (); 446 ob->destroy ();
447
440 return tmp; 448 return tmp;
441} 449}
442 450
443/* 451/*
444 * This is a new way of calculating the chance for an item to have 452 * This is a new way of calculating the chance for an item to have
… …
490 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 498 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
491 */ 499 */
492int 500int
493level_for_item (const object *op, int difficulty) 501level_for_item (const object *op, int difficulty)
494{ 502{
495 int olevel = 0;
496
497 if (!op->inv) 503 if (!op->inv)
498 { 504 {
499 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 505 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
500 return 0; 506 return 0;
501 } 507 }
502 508
503 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 509 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
504 510
505 if (olevel <= 0) 511 if (olevel <= 0)
506 olevel = rndm (1, MIN (op->inv->level, 1)); 512 olevel = rndm (1, op->inv->level);
507 513
508 if (olevel > MAXLEVEL) 514 return min (olevel, MAXLEVEL);
509 olevel = MAXLEVEL;
510
511 return olevel;
512} 515}
513 516
514/* 517/*
515 * Based upon the specified difficulty and upon the difftomagic_list array, 518 * Based upon the specified difficulty and upon the difftomagic_list array,
516 * a random magical bonus is returned. This is used when determine 519 * a random magical bonus is returned. This is used when determine
… …
572 575
573 op->magic = magic; 576 op->magic = magic;
574 if (op->arch) 577 if (op->arch)
575 { 578 {
576 if (op->type == ARMOUR) 579 if (op->type == ARMOUR)
577 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
578 581
579 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 582 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
580 magic = (-magic); 583 magic = (-magic);
584
581 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 585 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
582 } 586 }
583 else 587 else
584 { 588 {
585 if (op->type == ARMOUR) 589 if (op->type == ARMOUR)
586 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 590 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
591
587 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 592 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
588 magic = (-magic); 593 magic = (-magic);
594
589 op->weight = (op->weight * (100 - magic * 10)) / 100; 595 op->weight = (op->weight * (100 - magic * 10)) / 100;
590 } 596 }
591} 597}
592 598
593/* 599/*
… …
822 ARG_INT (flags))) 828 ARG_INT (flags)))
823 return; 829 return;
824 830
825 if (!(flags & GT_MINIMAL)) 831 if (!(flags & GT_MINIMAL))
826 { 832 {
827 if (op->arch == crown_arch) 833 if (IS_ARCH (op->arch, crown))
828 { 834 {
829 set_magic (difficulty, op, max_magic, flags); 835 set_magic (difficulty, op, max_magic, flags);
830 num_enchantments = calc_item_power (op, 1); 836 num_enchantments = calc_item_power (op, 1);
831 generate_artifact (op, difficulty); 837 generate_artifact (op, difficulty);
832 } 838 }
… …
837 843
838 num_enchantments = calc_item_power (op, 1); 844 num_enchantments = calc_item_power (op, 1);
839 845
840 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 846 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
841 || op->type == HORN 847 || op->type == HORN
842 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 848 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
843 * used for shop_floors or treasures */
844 generate_artifact (op, difficulty); 849 generate_artifact (op, difficulty);
845 } 850 }
846 851
847 /* Object was made an artifact. Calculate its item_power rating. 852 /* Object was made an artifact. Calculate its item_power rating.
848 * the item_power in the object is what the artfiact adds. 853 * the item_power in the object is what the artfiact adds.
… …
890 { 895 {
891 if (op->type == POTION) 896 if (op->type == POTION)
892 /* Handle healing and magic power potions */ 897 /* Handle healing and magic power potions */
893 if (op->stats.sp && !op->randomitems) 898 if (op->stats.sp && !op->randomitems)
894 { 899 {
895 object *tmp;
896
897 tmp = get_archetype (spell_mapping[op->stats.sp]); 900 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
898 insert_ob_in_ob (tmp, op); 901 insert_ob_in_ob (tmp, op);
899 op->stats.sp = 0; 902 op->stats.sp = 0;
900 } 903 }
901 } 904 }
902 else if (!op->title) /* Only modify object if not special */ 905 else if (!op->title) /* Only modify object if not special */
… …
960 SET_FLAG (op, FLAG_CURSED); 963 SET_FLAG (op, FLAG_CURSED);
961 break; 964 break;
962 } 965 }
963 966
964 case AMULET: 967 case AMULET:
965 if (op->arch == amulet_arch) 968 if (IS_ARCH (op->arch, amulet))
966 op->value *= 5; /* Since it's not just decoration */ 969 op->value *= 5; /* Since it's not just decoration */
967 970
968 case RING: 971 case RING:
969 if (op->arch == NULL)
970 {
971 op->destroy ();
972 op = 0;
973 break;
974 }
975
976 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 972 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
977 break; 973 break;
978 974
979 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 975 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
980 SET_FLAG (op, FLAG_CURSED); 976 SET_FLAG (op, FLAG_CURSED);
981 977
… …
1001 op->value *= 5; 997 op->value *= 5;
1002 set_ring_bonus (op, d); 998 set_ring_bonus (op, d);
1003 } 999 }
1004 } 1000 }
1005 1001
1006 if (GET_ANIM_ID (op)) 1002 if (op->animation_id)
1007 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1003 op->set_anim_frame (rndm (op->anim_frames ()));
1008 1004
1009 break; 1005 break;
1010 1006
1011 case BOOK: 1007 case BOOK:
1012 /* Is it an empty book?, if yes lets make a special· 1008 /* Is it an empty book?, if yes lets make a special·
… …
1027 op->level = rndm (creator->level); 1023 op->level = rndm (creator->level);
1028 1024
1029 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1025 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1030 /* books w/ info are worth more! */ 1026 /* books w/ info are worth more! */
1031 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1027 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1032 /* creator related stuff */
1033
1034 /* for library, chained books. Note that some monsters have no_pick
1035 * set - we don't want to set no pick in that case.
1036 */
1037 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1038 SET_FLAG (op, FLAG_NO_PICK);
1039 if (creator->slaying && !op->slaying) /* for check_inv floors */
1040 op->slaying = creator->slaying;
1041 1028
1042 /* add exp so reading it gives xp (once) */ 1029 /* add exp so reading it gives xp (once) */
1043 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1030 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1044 } 1031 }
1032
1033 /* creator related stuff */
1034
1035 /* for library, chained books. Note that some monsters have no_pick
1036 * set - we don't want to set no pick in that case.
1037 */
1038 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1039 SET_FLAG (op, FLAG_NO_PICK);
1040 if (creator->slaying && !op->slaying) /* for check_inv floors */
1041 op->slaying = creator->slaying;
1045 break; 1042 break;
1046 1043
1047 case SPELLBOOK: 1044 case SPELLBOOK:
1048 op->value = op->value * op->inv->value; 1045 op->value = op->value * op->inv->value;
1049 /* add exp so learning gives xp */ 1046 /* add exp so learning gives xp */
… …
1134 * Allocate and return the pointer to an empty artifactlist structure. 1131 * Allocate and return the pointer to an empty artifactlist structure.
1135 */ 1132 */
1136static artifactlist * 1133static artifactlist *
1137get_empty_artifactlist (void) 1134get_empty_artifactlist (void)
1138{ 1135{
1139 return salloc0 <artifactlist> (); 1136 return salloc0<artifactlist> ();
1140} 1137}
1141 1138
1142/* 1139/*
1143 * Allocate and return the pointer to an empty artifact structure. 1140 * Allocate and return the pointer to an empty artifact structure.
1144 */ 1141 */
1145static artifact * 1142static artifact *
1146get_empty_artifact (void) 1143get_empty_artifact (void)
1147{ 1144{
1148 return salloc0 <artifact> (); 1145 return salloc0<artifact> ();
1149} 1146}
1150 1147
1151/* 1148/*
1152 * Searches the artifact lists and returns one that has the same type 1149 * Searches the artifact lists and returns one that has the same type
1153 * of objects on it. 1150 * of objects on it.
… …
1158 for (artifactlist *al = first_artifactlist; al; al = al->next) 1155 for (artifactlist *al = first_artifactlist; al; al = al->next)
1159 if (al->type == type) 1156 if (al->type == type)
1160 return al; 1157 return al;
1161 1158
1162 return 0; 1159 return 0;
1163}
1164
1165/*
1166 * For debugging purposes. Dumps all tables.
1167 */
1168void
1169dump_artifacts (void)
1170{
1171 artifactlist *al;
1172 artifact *art;
1173 linked_char *next;
1174
1175 fprintf (logfile, "\n");
1176 for (al = first_artifactlist; al != NULL; al = al->next)
1177 {
1178 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1179 for (art = al->items; art != NULL; art = art->next)
1180 {
1181 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1182 if (art->allowed != NULL)
1183 {
1184 fprintf (logfile, "\tallowed combinations:");
1185 for (next = art->allowed; next != NULL; next = next->next)
1186 fprintf (logfile, "%s,", &next->name);
1187 fprintf (logfile, "\n");
1188 }
1189 }
1190 }
1191 fprintf (logfile, "\n");
1192}
1193
1194/*
1195 * For debugging purposes. Dumps all treasures recursively (see below).
1196 */
1197void
1198dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1199{
1200 treasurelist *tl;
1201 int i;
1202
1203 if (depth > 100)
1204 return;
1205
1206 while (t)
1207 {
1208 if (t->name)
1209 {
1210 for (i = 0; i < depth; i++)
1211 fprintf (logfile, " ");
1212
1213 fprintf (logfile, "{ (list: %s)\n", &t->name);
1214
1215 tl = treasurelist::find (t->name);
1216 if (tl)
1217 dump_monster_treasure_rec (name, tl->items, depth + 2);
1218
1219 for (i = 0; i < depth; i++)
1220 fprintf (logfile, " ");
1221
1222 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1223 }
1224 else
1225 {
1226 for (i = 0; i < depth; i++)
1227 fprintf (logfile, " ");
1228
1229 if (t->item && t->item->clone.type == FLESH)
1230 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1231 else
1232 fprintf (logfile, "%s\n", &t->item->clone.name);
1233 }
1234
1235 if (t->next_yes)
1236 {
1237 for (i = 0; i < depth; i++)
1238 fprintf (logfile, " ");
1239
1240 fprintf (logfile, " (if yes)\n");
1241 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1242 }
1243
1244 if (t->next_no)
1245 {
1246 for (i = 0; i < depth; i++)
1247 fprintf (logfile, " ");
1248
1249 fprintf (logfile, " (if no)\n");
1250 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1251 }
1252
1253 t = t->next;
1254 }
1255}
1256
1257/*
1258 * For debugging purposes. Dumps all treasures for a given monster.
1259 * Created originally by Raphael Quinet for debugging the alchemy code.
1260 */
1261void
1262dump_monster_treasure (const char *name)
1263{
1264 archetype *at;
1265 int found;
1266
1267 found = 0;
1268 fprintf (logfile, "\n");
1269
1270 for (at = first_archetype; at != NULL; at = at->next)
1271 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1272 {
1273 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1274 if (at->clone.randomitems != NULL)
1275 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1276 else
1277 fprintf (logfile, "(nothing)\n");
1278
1279 fprintf (logfile, "\n");
1280 found++;
1281 }
1282
1283 if (found == 0)
1284 fprintf (logfile, "No objects have the name %s!\n\n", name);
1285} 1160}
1286 1161
1287/* 1162/*
1288 * Builds up the lists of artifacts from the file in the libdir. 1163 * Builds up the lists of artifacts from the file in the libdir.
1289 */ 1164 */
… …
1303 sprintf (filename, "%s/artifacts", settings.datadir); 1178 sprintf (filename, "%s/artifacts", settings.datadir);
1304 object_thawer f (filename); 1179 object_thawer f (filename);
1305 1180
1306 if (!f) 1181 if (!f)
1307 return; 1182 return;
1308
1309 f.next ();
1310 1183
1311 for (;;) 1184 for (;;)
1312 { 1185 {
1313 switch (f.kw) 1186 switch (f.kw)
1314 { 1187 {
… …
1476 * to cast. So convert that to into a spell and put it into 1349 * to cast. So convert that to into a spell and put it into
1477 * this object. 1350 * this object.
1478 */ 1351 */
1479 if (op->type == HORN || op->type == POTION) 1352 if (op->type == HORN || op->type == POTION)
1480 { 1353 {
1481 object *tmp_obj;
1482
1483 /* Remove any spells this object currently has in it */ 1354 /* Remove any spells this object currently has in it */
1484 while (op->inv)
1485 op->inv->destroy (); 1355 op->destroy_inv (false);
1486 1356
1487 tmp_obj = arch_to_object (change->other_arch); 1357 object *tmp = arch_to_object (change->other_arch);
1488 insert_ob_in_ob (tmp_obj, op); 1358 insert_ob_in_ob (tmp, op);
1489 } 1359 }
1490 /* No harm setting this for potions/horns */ 1360 /* No harm setting this for potions/horns */
1491 op->other_arch = change->other_arch; 1361 op->other_arch = change->other_arch;
1492 } 1362 }
1493 1363
… …
1612 name = tmp->name + 1, neg = 1; 1482 name = tmp->name + 1, neg = 1;
1613 else 1483 else
1614 name = tmp->name, neg = 0; 1484 name = tmp->name, neg = 0;
1615 1485
1616 /* If we match name, then return the opposite of 'neg' */ 1486 /* If we match name, then return the opposite of 'neg' */
1617 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1487 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1618 return !neg; 1488 return !neg;
1619 1489
1620 /* Set success as true, since if the match was an inverse, it means 1490 /* Set success as true, since if the match was an inverse, it means
1621 * everything is allowed except what we match 1491 * everything is allowed except what we match
1622 */ 1492 */
… …
1698#if 1 1568#if 1
1699 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1569 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1700#endif 1570#endif
1701 return; 1571 return;
1702 } 1572 }
1703 if (!strcmp (art->item->name, "NONE")) 1573
1574 if (art->item->name == shstr_NONE)
1704 return; 1575 return;
1576
1705 if (FABS (op->magic) < art->item->magic) 1577 if (fabs (op->magic) < art->item->magic)
1706 continue; /* Not magic enough to be this item */ 1578 continue; /* Not magic enough to be this item */
1707 1579
1708 /* Map difficulty not high enough */ 1580 /* Map difficulty not high enough */
1709 if (difficulty < art->difficulty) 1581 if (difficulty < art->difficulty)
1710 continue; 1582 continue;
… …
1761 item->level = donor->level; 1633 item->level = donor->level;
1762 1634
1763 /* if donor has some attacktypes, the flesh is poisonous */ 1635 /* if donor has some attacktypes, the flesh is poisonous */
1764 if (donor->attacktype & AT_POISON) 1636 if (donor->attacktype & AT_POISON)
1765 item->type = POISON; 1637 item->type = POISON;
1638
1766 if (donor->attacktype & AT_ACID) 1639 if (donor->attacktype & AT_ACID)
1767 item->stats.hp = -1 * item->stats.food; 1640 item->stats.hp = -1 * item->stats.food;
1641
1768 SET_FLAG (item, FLAG_NO_STEAL); 1642 SET_FLAG (item, FLAG_NO_STEAL);
1769 } 1643 }
1770} 1644}
1771 1645
1772/* special_potion() - so that old potion code is still done right. */ 1646/* special_potion() - so that old potion code is still done right. */
… …
1809free_artifact (artifact *at) 1683free_artifact (artifact *at)
1810{ 1684{
1811 if (at->next) free_artifact (at->next); 1685 if (at->next) free_artifact (at->next);
1812 if (at->allowed) free_charlinks (at->allowed); 1686 if (at->allowed) free_charlinks (at->allowed);
1813 1687
1814 at->item->destroy (1); 1688 at->item->destroy ();
1815 1689
1816 sfree (at); 1690 sfree (at);
1817} 1691}
1818 1692
1819void 1693void

Diff Legend

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