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.16 by root, Mon Feb 5 01:24:45 2007 UTC

… …
16 * chance 10 16 * chance 10
17 * ingred dust of beholdereye,gem 17 * ingred dust of beholdereye,gem
18 * arch potion_generic 18 * arch potion_generic
19 */ 19 */
20 20
21#include <cctype>
22
21#include <global.h> 23#include <global.h>
22#include <object.h> 24#include <object.h>
23#include <ctype.h>
24 25
25static void build_stringlist (const char *str, char ***result_list, size_t * result_size); 26static void build_stringlist (const char *str, char ***result_list, size_t * result_size);
26 27
27static recipelist *formulalist; 28static recipelist *formulalist;
28 29
… …
93 { 94 {
94 artifact *art = locate_recipe_artifact (rp, i); 95 artifact *art = locate_recipe_artifact (rp, i);
95 96
96 if (!art && strcmp (rp->title, "NONE") != 0) 97 if (!art && strcmp (rp->title, "NONE") != 0)
97 { 98 {
98 LOG (llevError, "\nWARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title); 99 LOG (llevError, "WARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title);
99 result = 0; 100 result = 0;
100 } 101 }
101 } 102 }
102 else 103 else
103 { 104 {
104 LOG (llevError, "\nWARNING: Can't find archetype %s for formula %s\n", rp->arch_name[i], &rp->title); 105 LOG (llevError, "WARNING: Can't find archetype %s for formula %s\n", rp->arch_name[i], &rp->title);
105 result = 0; 106 result = 0;
106 } 107 }
107 } 108 }
108 109
109 return result; 110 return result;
… …
133 return; 134 return;
134 else 135 else
135 has_been_done = 1; 136 has_been_done = 1;
136 137
137 sprintf (filename, "%s/formulae", settings.datadir); 138 sprintf (filename, "%s/formulae", settings.datadir);
138 LOG (llevDebug, "Reading alchemical formulae from %s...", filename); 139 LOG (llevDebug, "Reading alchemical formulae from %s...\n", filename);
139 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 140 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
140 { 141 {
141 LOG (llevError, "Can't open %s.\n", filename); 142 LOG (llevError, "Can't open %s.\n", filename);
142 return; 143 return;
143 } 144 }
… …
253{ 254{
254 recipelist *fl; 255 recipelist *fl;
255 recipe *check, *formula; 256 recipe *check, *formula;
256 int numb = 1; 257 int numb = 1;
257 258
258 LOG (llevDebug, "Checking formulae lists..."); 259 LOG (llevDebug, "Checking formulae lists...\n");
259 260
260 for (fl = formulalist; fl != NULL; fl = fl->next) 261 for (fl = formulalist; fl != NULL; fl = fl->next)
261 { 262 {
262 for (formula = fl->items; formula != NULL; formula = formula->next) 263 for (formula = fl->items; formula != NULL; formula = formula->next)
263 for (check = formula->next; check != NULL; check = check->next) 264 for (check = formula->next; check != NULL; check = check->next)
… …
372 return at; 373 return at;
373 } 374 }
374 } 375 }
375 else 376 else
376 { 377 {
377 if (!strcasecmp (t->item->clone.name, name)) 378 if (t->item && !strcasecmp (t->item->clone.name, name))
378 return t->item; 379 return t->item;
379 } 380 }
380 381
381 if (t->next_yes) 382 if (t->next_yes)
382 { 383 {
… …
421 while (isdigit (*name)) 422 while (isdigit (*name))
422 { 423 {
423 mult = 10 * mult + (*name - '0'); 424 mult = 10 * mult + (*name - '0');
424 name++; 425 name++;
425 } 426 }
427
426 if (mult > 0) 428 if (mult > 0)
427 name++; 429 name++;
428 else 430 else
429 mult = 1; 431 mult = 1;
432
430 /* first, try to match the name of an archetype */ 433 /* first, try to match the name of an archetype */
431 for (at = first_archetype; at != NULL; at = at->next) 434 for (at = first_archetype; at != NULL; at = at->next)
432 { 435 {
433 if (at->clone.title != NULL) 436 if (at->clone.title != NULL)
434 { 437 {
… …
438 return mult * at->clone.value; 441 return mult * at->clone.value;
439 } 442 }
440 if (!strcasecmp (at->clone.name, name)) 443 if (!strcasecmp (at->clone.name, name))
441 return mult * at->clone.value; 444 return mult * at->clone.value;
442 } 445 }
446
443 /* second, try to match an artifact ("arch of something") */ 447 /* second, try to match an artifact ("arch of something") */
444 cp = strstr (name, " of "); 448 cp = strstr (name, " of ");
445 if (cp != NULL) 449 if (cp != NULL)
446 { 450 {
447 strcpy (part1, name); 451 strcpy (part1, name);
… …
461 if (!strcasecmp (art->item->name, part2)) 465 if (!strcasecmp (art->item->name, part2))
462 return mult * at->clone.value * art->item->value; 466 return mult * at->clone.value * art->item->value;
463 } 467 }
464 } 468 }
465 } 469 }
470
466 /* third, try to match a body part ("arch's something") */ 471 /* third, try to match a body part ("arch's something") */
467 cp = strstr (name, "'s "); 472 cp = strstr (name, "'s ");
468 if (cp != NULL) 473 if (cp)
469 { 474 {
470 strcpy (part1, name); 475 strcpy (part1, name);
471 part1[cp - name] = '\0'; 476 part1[cp - name] = '\0';
472 strcpy (part2, cp + 3); 477 strcpy (part2, cp + 3);
473 /* examine all archetypes matching the first part of the name */ 478 /* examine all archetypes matching the first part of the name */
… …
480 if (at2) 485 if (at2)
481 return mult * at2->clone.value * isqrt (at->clone.level * 2); 486 return mult * at2->clone.value * isqrt (at->clone.level * 2);
482 } 487 }
483 } 488 }
484 } 489 }
490
485 /* failed to find any matching items -- formula should be checked */ 491 /* failed to find any matching items -- formula should be checked */
486 return -1; 492 return -1;
487} 493}
488 494
489/* code copied from dump_alchemy() and modified by Raphael Quinet */ 495/* code copied from dump_alchemy() and modified by Raphael Quinet */
… …
649 for (fl = get_formulalist (1); fl; fl = fl->next) 655 for (fl = get_formulalist (1); fl; fl = fl->next)
650 number++; 656 number++;
651 657
652 /* now, randomly choose one */ 658 /* now, randomly choose one */
653 if (number > 0) 659 if (number > 0)
654 roll = RANDOM () % number; 660 roll = rndm (number);
655 661
656 fl = get_formulalist (1); 662 fl = get_formulalist (1);
657 while (roll && fl) 663 while (roll && fl)
658 { 664 {
659 if (fl->next) 665 if (fl->next)
… …
682 if ((fl = get_random_recipelist ()) == NULL) 688 if ((fl = get_random_recipelist ()) == NULL)
683 return rp; 689 return rp;
684 690
685 if (fl->total_chance > 0) 691 if (fl->total_chance > 0)
686 { 692 {
687 r = RANDOM () % fl->total_chance; 693 r = rndm (fl->total_chance);
688 for (rp = fl->items; rp; rp = rp->next) 694 for (rp = fl->items; rp; rp = rp->next)
689 { 695 {
690 r -= rp->chance; 696 r -= rp->chance;
691 if (r < 0) 697 if (r < 0)
692 break; 698 break;
… …
743 char *dup; 749 char *dup;
744 char *p; 750 char *p;
745 size_t size; 751 size_t size;
746 size_t i; 752 size_t i;
747 753
748 dup = strdup_local (str); 754 dup = strdup (str);
749 if (dup == NULL) 755 if (dup == NULL)
750 fatal (OUT_OF_MEMORY); 756 fatal (OUT_OF_MEMORY);
751 757
752 size = 0; 758 size = 0;
753 for (p = strtok (dup, ","); p != NULL; p = strtok (NULL, ",")) 759 for (p = strtok (dup, ","); p != NULL; p = strtok (NULL, ","))

Diff Legend

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