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

Comparing deliantra/server/common/recipe.C (file contents):
Revision 1.13 by pippijn, Wed Jan 3 00:08:17 2007 UTC vs.
Revision 1.26 by root, Tue May 6 16:55:25 2008 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */
23
1/* Basic stuff for use with the alchemy code. Clearly some of this stuff 24/* Basic stuff for use with the alchemy code. Clearly some of this stuff
2 * could go into server/alchemy, but I left it here just in case it proves 25 * could go into server/alchemy, but I left it here just in case it proves
3 * more generally useful. 26 * more generally useful.
4 * 27 *
5 * Nov 1995 - file created by b.t. thomas@astro.psu.edu 28 * Nov 1995 - file created by b.t. thomas@astro.psu.edu
… …
10 * Ingredients are just comma delimited list of archetype (or object) 33 * Ingredients are just comma delimited list of archetype (or object)
11 * names. 34 * names.
12 */ 35 */
13 36
14/* Example 'formula' entry in libdir/formulae: 37/* Example 'formula' entry in libdir/formulae:
15 * Object transparency 38 * object transparency
16 * chance 10 39 * chance 10
17 * ingred dust of beholdereye,gem 40 * ingred dust of beholdereye,gem
18 * arch potion_generic 41 * arch potion_generic
19 */ 42 */
20 43
… …
32{ 55{
33 recipelist *tl = new recipelist; 56 recipelist *tl = new recipelist;
34 57
35 tl->total_chance = 0; 58 tl->total_chance = 0;
36 tl->number = 0; 59 tl->number = 0;
37 tl->items = NULL; 60 tl->items = 0;
38 tl->next = NULL; 61 tl->next = 0;
62
39 return tl; 63 return tl;
40} 64}
41 65
42static recipe * 66static recipe *
43get_empty_formula (void) 67get_empty_formula (void)
… …
60 t->next = NULL; 84 t->next = NULL;
61 return t; 85 return t;
62} 86}
63 87
64/* get_formulalist() - returns pointer to the formula list */ 88/* get_formulalist() - returns pointer to the formula list */
65
66recipelist * 89recipelist *
67get_formulalist (int i) 90get_formulalist (int i)
68{ 91{
69 recipelist *fl = formulalist; 92 recipelist *fl = formulalist;
70 int number = i; 93 int number = i;
… …
73 { 96 {
74 if (!(fl = fl->next)) 97 if (!(fl = fl->next))
75 break; 98 break;
76 number--; 99 number--;
77 } 100 }
101
78 return fl; 102 return fl;
79} 103}
80 104
81/* check_recipe() - makes sure we actually have the requested artifact 105/* check_recipe() - makes sure we actually have the requested artifact
82 * and archetype. */ 106 * and archetype. */
83
84static int 107static int
85check_recipe (const recipe *rp) 108check_recipe (const recipe *rp)
86{ 109{
87 size_t i; 110 size_t i;
88 int result; 111 int result = 1;
89 112
90 result = 1;
91 for (i = 0; i < rp->arch_names; i++) 113 for (i = 0; i < rp->arch_names; i++)
92 { 114 {
93 if (archetype::find (rp->arch_name[i]) != NULL) 115 if (archetype::find (rp->arch_name[i]) != NULL)
94 { 116 {
95 artifact *art = locate_recipe_artifact (rp, i); 117 artifact *art = locate_recipe_artifact (rp, i);
… …
108 } 130 }
109 131
110 return result; 132 return result;
111} 133}
112 134
113
114/* 135/*
115 * init_formulae() - Builds up the lists of formula from the file in 136 * init_formulae() - Builds up the lists of formula from the file in
116 * the libdir. -b.t. 137 * the libdir. -b.t.
117 */ 138 */
118
119void 139void
120init_formulae (void) 140init_formulae (void)
121{ 141{
122 static int has_been_done = 0; 142 static int has_been_done = 0;
123 FILE *fp; 143 FILE *fp;
… …
151 *cp = '\0'; 171 *cp = '\0';
152 cp = buf; 172 cp = buf;
153 while (*cp == ' ') /* Skip blanks */ 173 while (*cp == ' ') /* Skip blanks */
154 cp++; 174 cp++;
155 175
156 if (!strncmp (cp, "Object", 6)) 176 if (!strncmp (cp, "object", 6))
157 { 177 {
158 formula = get_empty_formula (); 178 formula = get_empty_formula ();
159 formula->title = strchr (cp, ' ') + 1; 179 formula->title = strchr (cp, ' ') + 1;
160 } 180 }
161 else if (!strncmp (cp, "keycode", 7)) 181 else if (!strncmp (cp, "keycode", 7))
162 {
163 formula->keycode = strchr (cp, ' ') + 1; 182 formula->keycode = strchr (cp, ' ') + 1;
164 }
165 else if (sscanf (cp, "trans %d", &value)) 183 else if (sscanf (cp, "trans %d", &value))
166 {
167 formula->transmute = (uint16) value; 184 formula->transmute = (uint16) value;
168 }
169 else if (sscanf (cp, "yield %d", &value)) 185 else if (sscanf (cp, "yield %d", &value))
170 {
171 formula->yield = (uint16) value; 186 formula->yield = (uint16) value;
172 }
173 else if (sscanf (cp, "chance %d", &value)) 187 else if (sscanf (cp, "chance %d", &value))
174 {
175 formula->chance = (uint16) value; 188 formula->chance = (uint16) value;
176 }
177 else if (sscanf (cp, "exp %d", &value)) 189 else if (sscanf (cp, "exp %d", &value))
178 {
179 formula->exp = (uint16) value; 190 formula->exp = (uint16) value;
180 }
181 else if (sscanf (cp, "diff %d", &value)) 191 else if (sscanf (cp, "diff %d", &value))
182 {
183 formula->diff = (uint16) value; 192 formula->diff = (uint16) value;
184 }
185 else if (!strncmp (cp, "ingred", 6)) 193 else if (!strncmp (cp, "ingred", 6))
186 { 194 {
187 int numb_ingred = 1; 195 int numb_ingred = 1;
188 196
189 cp = strchr (cp, ' ') + 1; 197 cp = strchr (cp, ' ') + 1;
… …
192 if ((next = strchr (cp, ',')) != NULL) 200 if ((next = strchr (cp, ',')) != NULL)
193 { 201 {
194 *(next++) = '\0'; 202 *(next++) = '\0';
195 numb_ingred++; 203 numb_ingred++;
196 } 204 }
205
197 tmp = new linked_char; 206 tmp = new linked_char;
198 207
199 tmp->name = cp; 208 tmp->name = cp;
200 tmp->next = formula->ingred; 209 tmp->next = formula->ingred;
201 formula->ingred = tmp; 210 formula->ingred = tmp;
… …
204 * quickly for the right recipe. 213 * quickly for the right recipe.
205 */ 214 */
206 formula->index += strtoint (cp); 215 formula->index += strtoint (cp);
207 } 216 }
208 while ((cp = next) != NULL); 217 while ((cp = next) != NULL);
218
209 /* now find the correct (# of ingred ordered) formulalist */ 219 /* now find the correct (# of ingred ordered) formulalist */
210 fl = formulalist; 220 fl = formulalist;
211 while (numb_ingred != 1) 221 while (numb_ingred != 1)
212 { 222 {
213 if (!fl->next) 223 if (!fl->next)
214 fl->next = init_recipelist (); 224 fl->next = init_recipelist ();
225
215 fl = fl->next; 226 fl = fl->next;
216 numb_ingred--; 227 numb_ingred--;
217 } 228 }
229
218 fl->total_chance += formula->chance; 230 fl->total_chance += formula->chance;
219 fl->number++; 231 fl->number++;
220 formula->next = fl->items; 232 formula->next = fl->items;
221 fl->items = formula; 233 fl->items = formula;
222 } 234 }
… …
224 { 236 {
225 build_stringlist (strchr (cp, ' ') + 1, &formula->arch_name, &formula->arch_names); 237 build_stringlist (strchr (cp, ' ') + 1, &formula->arch_name, &formula->arch_names);
226 check_recipe (formula); 238 check_recipe (formula);
227 } 239 }
228 else if (!strncmp (cp, "skill", 5)) 240 else if (!strncmp (cp, "skill", 5))
229 {
230 formula->skill = strchr (cp, ' ') + 1; 241 formula->skill = strchr (cp, ' ') + 1;
231 }
232 else if (!strncmp (cp, "cauldron", 8)) 242 else if (!strncmp (cp, "cauldron", 8))
233 {
234 formula->cauldron = strchr (cp, ' ') + 1; 243 formula->cauldron = strchr (cp, ' ') + 1;
235 }
236 else 244 else
237 LOG (llevError, "Unknown input in file %s: %s\n", filename, buf); 245 LOG (llevError, "Unknown input in file %s: %s\n", filename, buf);
238 } 246 }
247
239 LOG (llevDebug, "done.\n"); 248 LOG (llevDebug, "done.\n");
240 close_and_delete (fp, comp); 249 close_and_delete (fp, comp);
241 /* Lastly, lets check for problems in formula we got */ 250 /* Lastly, lets check for problems in formula we got */
242 check_formulae (); 251 check_formulae ();
243} 252}
… …
256 recipe *check, *formula; 265 recipe *check, *formula;
257 int numb = 1; 266 int numb = 1;
258 267
259 LOG (llevDebug, "Checking formulae lists...\n"); 268 LOG (llevDebug, "Checking formulae lists...\n");
260 269
261 for (fl = formulalist; fl != NULL; fl = fl->next) 270 for (fl = formulalist; fl; fl = fl->next)
262 { 271 {
263 for (formula = fl->items; formula != NULL; formula = formula->next) 272 for (formula = fl->items; formula; formula = formula->next)
264 for (check = formula->next; check != NULL; check = check->next) 273 for (check = formula->next; check; check = check->next)
265 if (check->index == formula->index) 274 if (check->index == formula->index)
266 { 275 {
267 LOG (llevError, " ERROR: On %d ingred list: ", numb); 276 LOG (llevError, " ERROR: On %d ingred list: ", numb);
268 LOG (llevError, "Formulae [%s] of %s and [%s] of %s have matching index id (%d)\n", 277 LOG (llevError, "Formulae [%s] of %s and [%s] of %s have matching index id (%d)\n",
269 formula->arch_name[0], &formula->title, check->arch_name[0], &check->title, formula->index); 278 formula->arch_name[0], &formula->title, check->arch_name[0], &check->title, formula->index);
… …
273 282
274 LOG (llevDebug, "done.\n"); 283 LOG (llevDebug, "done.\n");
275 284
276} 285}
277 286
278/* Borrowed (again) from the artifacts code for this */
279
280void
281dump_alchemy (void)
282{
283 recipelist *fl = formulalist;
284 recipe *formula = NULL;
285 linked_char *next;
286 int num_ingred = 1;
287
288 fprintf (logfile, "\n");
289 while (fl)
290 {
291 fprintf (logfile, "\n Formulae with %d ingredient%s %d Formulae with total_chance=%d\n",
292 num_ingred, num_ingred > 1 ? "s." : ".", fl->number, fl->total_chance);
293 for (formula = fl->items; formula != NULL; formula = formula->next)
294 {
295 artifact *art = NULL;
296 char buf[MAX_BUF];
297 size_t i;
298
299 for (i = 0; i < formula->arch_names; i++)
300 {
301 const char *string = formula->arch_name[i];
302
303 if (archetype::find (string) != NULL)
304 {
305 art = locate_recipe_artifact (formula, i);
306 if (!art && strcmp (formula->title, "NONE"))
307 LOG (llevError, "Formula %s has no artifact\n", &formula->title);
308 else
309 {
310 if (strcmp (formula->title, "NONE"))
311 sprintf (buf, "%s of %s", string, &formula->title);
312 else
313 sprintf (buf, "%s", string);
314 fprintf (logfile, "%-30s(%d) bookchance %3d ", buf, formula->index, formula->chance);
315 fprintf (logfile, "skill %s", &formula->skill);
316 fprintf (logfile, "\n");
317 if (formula->ingred != NULL)
318 {
319 int nval = 0, tval = 0;
320
321 fprintf (logfile, "\tIngred: ");
322 for (next = formula->ingred; next != NULL; next = next->next)
323 {
324 if (nval != 0)
325 fprintf (logfile, ",");
326 fprintf (logfile, "%s(%d)", &next->name, (nval = strtoint (next->name)));
327 tval += nval;
328 }
329 fprintf (logfile, "\n");
330 if (tval != formula->index)
331 fprintf (logfile, "WARNING:ingredient list and formula values not equal.\n");
332 }
333 if (formula->skill != NULL)
334 fprintf (logfile, "\tSkill Required: %s", &formula->skill);
335 if (formula->cauldron != NULL)
336 fprintf (logfile, "\tCauldron: %s\n", &formula->cauldron);
337 fprintf (logfile, "\tDifficulty: %d\t Exp: %d\n", formula->diff, formula->exp);
338 }
339 }
340 else
341 LOG (llevError, "Can't find archetype:%s for formula %s\n", string, &formula->title);
342 }
343 }
344 fprintf (logfile, "\n");
345 fl = fl->next;
346 num_ingred++;
347 }
348}
349
350/* Find a treasure with a matching name. The 'depth' parameter is 287/* Find a treasure with a matching name. The 'depth' parameter is
351 * only there to prevent infinite loops in treasure lists (a list 288 * only there to prevent infinite loops in treasure lists (a list
352 * referencing another list pointing back to the first one). */ 289 * referencing another list pointing back to the first one). */
353archetype * 290archetype *
354find_treasure_by_name (const treasure *t, const char *name, int depth) 291find_treasure_by_name (const treasure *t, const char *name, int depth)
355{ 292{
356 treasurelist *tl;
357 archetype *at;
358
359 if (depth > 10) 293 if (depth > 10)
360 return 0; 294 return 0;
361 295
362 while (t) 296 while (t)
363 { 297 {
364 if (t->name) 298 if (t->name)
365 { 299 {
366 tl = find_treasurelist (t->name); 300 if (treasurelist *tl = treasurelist::find (t->name))
367
368 if (tl) 301 if (tl->items)
369 {
370 at = find_treasure_by_name (tl->items, name, depth + 1); 302 if (archetype *at = find_treasure_by_name (tl->items, name, depth + 1))
371
372 if (at)
373 return at; 303 return at;
374 }
375 } 304 }
376 else 305 else
377 { 306 {
378 if (!strcasecmp (t->item->clone.name, name)) 307 if (t->item && !strcasecmp (t->item->object::name, name))
379 return t->item; 308 return t->item;
380 } 309 }
381 310
382 if (t->next_yes) 311 if (t->next_yes)
383 {
384 at = find_treasure_by_name (t->next_yes, name, depth); 312 if (archetype *at = find_treasure_by_name (t->next_yes, name, depth))
385 if (at)
386 return at; 313 return at;
387 }
388 314
389 if (t->next_no) 315 if (t->next_no)
390 {
391 at = find_treasure_by_name (t->next_no, name, depth); 316 if (archetype *at = find_treasure_by_name (t->next_no, name, depth))
392 if (at)
393 return at; 317 return at;
394 } 318
395 t = t->next; 319 t = t->next;
396 } 320 }
321
397 return 0; 322 return 0;
398} 323}
399 324
400/* If several archetypes have the same name, the value of the first 325/* If several archetypes have the same name, the value of the first
401 * one with that name will be returned. This happens for the 326 * one with that name will be returned. This happens for the
… …
406 * body parts that we are looking for (e.g. big_dragon and 331 * body parts that we are looking for (e.g. big_dragon and
407 * big_dragon_worthless). */ 332 * big_dragon_worthless). */
408long 333long
409find_ingred_cost (const char *name) 334find_ingred_cost (const char *name)
410{ 335{
411 archetype *at;
412 archetype *at2; 336 archetype *at2;
413 artifactlist *al; 337 artifactlist *al;
414 artifact *art; 338 artifact *art;
415 long mult; 339 long mult;
416 char *cp; 340 char *cp;
… …
422 while (isdigit (*name)) 346 while (isdigit (*name))
423 { 347 {
424 mult = 10 * mult + (*name - '0'); 348 mult = 10 * mult + (*name - '0');
425 name++; 349 name++;
426 } 350 }
351
427 if (mult > 0) 352 if (mult > 0)
428 name++; 353 name++;
429 else 354 else
430 mult = 1; 355 mult = 1;
356
431 /* first, try to match the name of an archetype */ 357 /* first, try to match the name of an archetype */
432 for (at = first_archetype; at != NULL; at = at->next) 358 for_all_archetypes (at)
433 { 359 {
434 if (at->clone.title != NULL) 360 if (at->title != NULL)
435 { 361 {
436 /* inefficient, but who cares? */ 362 /* inefficient, but who cares? */
437 sprintf (part1, "%s %s", &at->clone.name, &at->clone.title); 363 sprintf (part1, "%s %s", &at->object::name, &at->title);
438 if (!strcasecmp (part1, name)) 364 if (!strcasecmp (part1, name))
439 return mult * at->clone.value; 365 return mult * at->value;
440 } 366 }
441 if (!strcasecmp (at->clone.name, name)) 367 if (!strcasecmp (at->object::name, name))
442 return mult * at->clone.value; 368 return mult * at->value;
443 } 369 }
370
444 /* second, try to match an artifact ("arch of something") */ 371 /* second, try to match an artifact ("arch of something") */
445 cp = strstr (name, " of "); 372 cp = strstr (name, " of ");
446 if (cp != NULL) 373 if (cp != NULL)
447 { 374 {
448 strcpy (part1, name); 375 strcpy (part1, name);
449 part1[cp - name] = '\0'; 376 part1[cp - name] = '\0';
450 strcpy (part2, cp + 4); 377 strcpy (part2, cp + 4);
378
451 /* find the first archetype matching the first part of the name */ 379 /* find the first archetype matching the first part of the name */
452 for (at = first_archetype; at != NULL; at = at->next) 380 for_all_archetypes (at)
453 if (!strcasecmp (at->clone.name, part1) && at->clone.title == NULL) 381 if (!strcasecmp (at->object::name, part1) && at->title == NULL)
454 break;
455 if (at != NULL)
456 { 382 {
457 /* find the first artifact derived from that archetype (same type) */ 383 /* find the first artifact derived from that archetype (same type) */
458 for (al = first_artifactlist; al != NULL; al = al->next) 384 for (al = first_artifactlist; al; al = al->next)
459 if (al->type == at->clone.type) 385 if (al->type == at->type)
460 { 386 {
461 for (art = al->items; art != NULL; art = art->next) 387 for (art = al->items; art; art = art->next)
462 if (!strcasecmp (art->item->name, part2)) 388 if (!strcasecmp (art->item->name, part2))
463 return mult * at->clone.value * art->item->value; 389 return mult * at->value * art->item->value;
464 } 390 }
465 } 391 }
466 } 392 }
393
467 /* third, try to match a body part ("arch's something") */ 394 /* third, try to match a body part ("arch's something") */
468 cp = strstr (name, "'s "); 395 cp = strstr (name, "'s ");
469 if (cp != NULL) 396 if (cp)
470 { 397 {
471 strcpy (part1, name); 398 strcpy (part1, name);
472 part1[cp - name] = '\0'; 399 part1[cp - name] = '\0';
473 strcpy (part2, cp + 3); 400 strcpy (part2, cp + 3);
474 /* examine all archetypes matching the first part of the name */ 401 /* examine all archetypes matching the first part of the name */
475 for (at = first_archetype; at != NULL; at = at->next) 402 for_all_archetypes (at)
476 if (!strcasecmp (at->clone.name, part1) && at->clone.title == NULL) 403 if (!strcasecmp (at->object::name, part1) && at->title == NULL)
477 { 404 {
478 if (at->clone.randomitems != NULL) 405 if (at->randomitems)
479 { 406 {
480 at2 = find_treasure_by_name (at->clone.randomitems->items, part2, 0); 407 at2 = find_treasure_by_name (at->randomitems->items, part2, 0);
481 if (at2) 408 if (at2)
482 return mult * at2->clone.value * isqrt (at->clone.level * 2); 409 return mult * at2->value * isqrt (at->level * 2);
483 } 410 }
484 } 411 }
485 } 412 }
413
486 /* failed to find any matching items -- formula should be checked */ 414 /* failed to find any matching items -- formula should be checked */
487 return -1; 415 return -1;
488} 416}
489 417
490/* code copied from dump_alchemy() and modified by Raphael Quinet */
491void
492dump_alchemy_costs (void)
493{
494 recipelist *fl = formulalist;
495 recipe *formula = NULL;
496 linked_char *next;
497 int num_ingred = 1;
498 int num_errors = 0;
499 long cost;
500 long tcost;
501
502 fprintf (logfile, "\n");
503 while (fl)
504 {
505 fprintf (logfile, "\n Formulae with %d ingredient%s %d Formulae with total_chance=%d\n",
506 num_ingred, num_ingred > 1 ? "s." : ".", fl->number, fl->total_chance);
507 for (formula = fl->items; formula != NULL; formula = formula->next)
508 {
509 artifact *art = NULL;
510 archetype *at = NULL;
511 char buf[MAX_BUF];
512 size_t i;
513
514 for (i = 0; i < formula->arch_names; i++)
515 {
516 const char *string = formula->arch_name[i];
517
518 if ((at = archetype::find (string)) != NULL)
519 {
520 art = locate_recipe_artifact (formula, i);
521 if (!art && strcmp (formula->title, "NONE"))
522 LOG (llevError, "Formula %s has no artifact\n", &formula->title);
523 else
524 {
525 if (!strcmp (formula->title, "NONE"))
526 sprintf (buf, "%s", string);
527 else
528 sprintf (buf, "%s of %s", string, &formula->title);
529 fprintf (logfile, "\n%-40s bookchance %3d skill %s\n", buf, formula->chance, &(formula->skill));
530 if (formula->ingred != NULL)
531 {
532 tcost = 0;
533 for (next = formula->ingred; next != NULL; next = next->next)
534 {
535 cost = find_ingred_cost (next->name);
536 if (cost < 0)
537 num_errors++;
538 fprintf (logfile, "\t%-33s%5ld\n", &next->name, cost);
539 if (cost < 0 || tcost < 0)
540 tcost = -1;
541 else
542 tcost += cost;
543 }
544 if (art != NULL && art->item != NULL)
545 cost = at->clone.value * art->item->value;
546 else
547 cost = at->clone.value;
548 fprintf (logfile, "\t\tBuying result costs: %5ld", cost);
549 if (formula->yield > 1)
550 {
551 fprintf (logfile, " to %ld (max %d items)\n", cost * formula->yield, formula->yield);
552 cost = cost * (formula->yield + 1L) / 2L;
553 }
554 else
555 fprintf (logfile, "\n");
556 fprintf (logfile, "\t\tIngredients cost: %5ld\n\t\tComment: ", tcost);
557 if (tcost < 0)
558 fprintf (logfile, "Could not find some ingredients. Check the formula!\n");
559 else if (tcost > cost)
560 fprintf (logfile, "Ingredients are much too expensive. Useless formula.\n");
561 else if (tcost * 2L > cost)
562 fprintf (logfile, "Ingredients are too expensive.\n");
563 else if (tcost * 10L < cost)
564 fprintf (logfile, "Ingredients are too cheap.\n");
565 else
566 fprintf (logfile, "OK.\n");
567 }
568 }
569 }
570 else
571 LOG (llevError, "Can't find archetype:%s for formula %s\n", string, &formula->title);
572 }
573 }
574 fprintf (logfile, "\n");
575 fl = fl->next;
576 num_ingred++;
577 }
578 if (num_errors > 0)
579 fprintf (logfile, "WARNING: %d objects required by the formulae do not exist in the game.\n", num_errors);
580}
581
582const char * 418const char *
583ingred_name (const char *name) 419ingred_name (const char *name)
584{ 420{
585 const char *cp = name; 421 const char *cp = name;
586 422
587 if (atoi (cp)) 423 if (atoi (cp))
588 cp = strchr (cp, ' ') + 1; 424 cp = strchr (cp, ' ') + 1;
425
589 return cp; 426 return cp;
590} 427}
591 428
592/* strtoint() - we use this to convert buf into an integer 429/* strtoint() - we use this to convert buf into an integer
593 * equal to the coadded sum of the (lowercase) character 430 * equal to the coadded sum of the (lowercase) character
… …
610} 447}
611 448
612artifact * 449artifact *
613locate_recipe_artifact (const recipe *rp, size_t idx) 450locate_recipe_artifact (const recipe *rp, size_t idx)
614{ 451{
615 object *item = get_archetype (rp->arch_name[idx]); 452 archetype *at = archetype::find (rp->arch_name [idx]);
616 artifactlist *at = NULL;
617 artifact *art = NULL;
618 453
619 if (!item) 454 if (at)
620 return (artifact *) NULL;
621
622 if ((at = find_artifactlist (item->type))) 455 if (artifactlist *al = find_artifactlist (at->type))
623 for (art = at->items; art; art = art->next) 456 for (artifact *art = al->items; art; art = art->next)
624 if (!strcmp (art->item->name, rp->title)) 457 if (art->item->name == rp->title)
625 break; 458 return art;
626 459
627 item->destroy ();
628
629 return art; 460 return 0;
630} 461}
631 462
632int 463int
633numb_ingred (const char *buf) 464numb_ingred (const char *buf)
634{ 465{
… …
650 for (fl = get_formulalist (1); fl; fl = fl->next) 481 for (fl = get_formulalist (1); fl; fl = fl->next)
651 number++; 482 number++;
652 483
653 /* now, randomly choose one */ 484 /* now, randomly choose one */
654 if (number > 0) 485 if (number > 0)
655 roll = RANDOM () % number; 486 roll = rndm (number);
656 487
657 fl = get_formulalist (1); 488 fl = get_formulalist (1);
658 while (roll && fl) 489 while (roll && fl)
659 { 490 {
660 if (fl->next) 491 if (fl->next)
… …
683 if ((fl = get_random_recipelist ()) == NULL) 514 if ((fl = get_random_recipelist ()) == NULL)
684 return rp; 515 return rp;
685 516
686 if (fl->total_chance > 0) 517 if (fl->total_chance > 0)
687 { 518 {
688 r = RANDOM () % fl->total_chance; 519 r = rndm (fl->total_chance);
689 for (rp = fl->items; rp; rp = rp->next) 520 for (rp = fl->items; rp; rp = rp->next)
690 { 521 {
691 r -= rp->chance; 522 r -= rp->chance;
692 if (r < 0) 523 if (r < 0)
693 break; 524 break;

Diff Legend

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