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

Diff Legend

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