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.6 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.27 by root, Thu Jan 1 11:41:17 2009 UTC

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