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

Diff Legend

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