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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.85 by root, Tue May 5 04:51:56 2009 UTC vs.
Revision 1.100 by root, Sat Jan 16 13:41:37 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
32 33
33//#define TREASURE_VERBOSE 34//#define TREASURE_VERBOSE
34 35
35#include <global.h> 36#include <global.h>
36#include <treasure.h> 37#include <treasure.h>
37#include <loader.h>
38 38
39extern char *spell_mapping[]; 39extern char *spell_mapping[];
40 40
41static treasurelist *first_treasurelist; 41static treasurelist *first_treasurelist;
42 42
50 slice_allocator< std::pair<const char *const, treasurelist *> > 50 slice_allocator< std::pair<const char *const, treasurelist *> >
51> tl_map_t; 51> tl_map_t;
52 52
53static tl_map_t tl_map; 53static tl_map_t tl_map;
54 54
55//TODO: class method
56static void free_treasurestruct (treasure *t); // bleh desu
57static void
58clear (treasurelist *tl)
59{
60 if (tl->items)
61 {
62 free_treasurestruct (tl->items);
63 tl->items = 0;
64 }
65
66 tl->total_chance = 0;
67}
68
55/* 69/*
56 * Searches for the given treasurelist 70 * Searches for the given treasurelist
57 */ 71 */
58treasurelist * 72treasurelist *
59treasurelist::find (const char *name) 73treasurelist::find (const char *name)
88 102
89 tl_map.insert (std::make_pair (tl->name, tl)); 103 tl_map.insert (std::make_pair (tl->name, tl));
90 } 104 }
91 105
92 return tl; 106 return tl;
93}
94
95//TODO: class method
96void
97clear (treasurelist *tl)
98{
99 if (tl->items)
100 {
101 free_treasurestruct (tl->items);
102 tl->items = 0;
103 }
104
105 tl->total_chance = 0;
106} 107}
107 108
108#ifdef TREASURE_DEBUG 109#ifdef TREASURE_DEBUG
109/* recursived checks the linked list. Treasurelist is passed only 110/* recursived checks the linked list. Treasurelist is passed only
110 * so that the treasure name can be printed out 111 * so that the treasure name can be printed out
308 } 309 }
309 else 310 else
310 { 311 {
311 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE))) 312 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
312 { 313 {
313 object *tmp = arch_to_object (t->item); 314 object *tmp = t->item->instance ();
314 315
315 if (t->nrof && tmp->nrof <= 1) 316 if (t->nrof && tmp->nrof <= 1)
316 tmp->nrof = rndm (t->nrof) + 1; 317 tmp->nrof = rndm (t->nrof) + 1;
317 318
318 fix_generated_item (tmp, op, difficulty, t->magic, flag); 319 fix_generated_item (tmp, op, difficulty, t->magic, flag);
365 else if (t->nrof) 366 else if (t->nrof)
366 create_one_treasure (tl, op, flag, difficulty, tries); 367 create_one_treasure (tl, op, flag, difficulty, tries);
367 } 368 }
368 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE)) 369 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
369 { 370 {
370 if (object *tmp = arch_to_object (t->item)) 371 if (object *tmp = t->item->instance ())
371 { 372 {
372 if (t->nrof && tmp->nrof <= 1) 373 if (t->nrof && tmp->nrof <= 1)
373 tmp->nrof = rndm (t->nrof) + 1; 374 tmp->nrof = rndm (t->nrof) + 1;
374 375
375 fix_generated_item (tmp, op, difficulty, t->magic, flag); 376 fix_generated_item (tmp, op, difficulty, t->magic, flag);
494 * This code presumes that op has had its spell object created (in op->inv) 495 * This code presumes that op has had its spell object created (in op->inv)
495 * 496 *
496 * elmex Wed Aug 9 17:44:59 CEST 2006: 497 * elmex Wed Aug 9 17:44:59 CEST 2006:
497 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 498 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
498 */ 499 */
499int 500static int
500level_for_item (const object *op, int difficulty) 501level_for_item (const object *op, int difficulty)
501{ 502{
502 if (!op->inv) 503 if (!op->inv)
503 { 504 {
504 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 505 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
521 * elmex Thu Aug 10 18:45:44 CEST 2006: 522 * elmex Thu Aug 10 18:45:44 CEST 2006:
522 * Scaling difficulty by max_level, as difficulty is a level and not some 523 * Scaling difficulty by max_level, as difficulty is a level and not some
523 * weird integer between 1-31. 524 * weird integer between 1-31.
524 * 525 *
525 */ 526 */
526int 527static int
527magic_from_difficulty (int difficulty) 528magic_from_difficulty (int difficulty)
528{ 529{
529 int percent = 0, magic = 0; 530 int percent = 0, magic = 0;
530 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 531 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
531 532
621 * 1) Since rings can have multiple bonuses, if the same bonus 622 * 1) Since rings can have multiple bonuses, if the same bonus
622 * is rolled again, increase it - the bonuses now stack with 623 * is rolled again, increase it - the bonuses now stack with
623 * other bonuses previously rolled and ones the item might natively have. 624 * other bonuses previously rolled and ones the item might natively have.
624 * 2) Add code to deal with new PR method. 625 * 2) Add code to deal with new PR method.
625 */ 626 */
626void 627static void
627set_ring_bonus (object *op, int bonus) 628set_ring_bonus (object *op, int bonus)
628{ 629{
629
630 int r = rndm (bonus > 0 ? 25 : 11); 630 int r = rndm (bonus > 0 ? 25 : 11);
631 631
632 if (op->type == AMULET) 632 if (op->type == AMULET)
633 { 633 {
634 if (!(rndm (21))) 634 if (!(rndm (21)))
757 * higher is the chance of returning a low number. 757 * higher is the chance of returning a low number.
758 * It is only used in fix_generated_treasure() to set bonuses on 758 * It is only used in fix_generated_treasure() to set bonuses on
759 * rings and amulets. 759 * rings and amulets.
760 * Another scheme is used to calculate the magic of weapons and armours. 760 * Another scheme is used to calculate the magic of weapons and armours.
761 */ 761 */
762int 762static int
763get_magic (int diff) 763get_magic (int diff)
764{ 764{
765 int i; 765 int i;
766 766
767 if (diff < 3) 767 if (diff < 3)
770 for (i = 0; i < 4; i++) 770 for (i = 0; i < 4; i++)
771 if (rndm (diff)) 771 if (rndm (diff))
772 return i; 772 return i;
773 773
774 return 4; 774 return 4;
775}
776
777/* special_potion() - so that old potion code is still done right. */
778static int
779special_potion (object *op)
780{
781 if (op->attacktype)
782 return 1;
783
784 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
785 return 1;
786
787 for (int i = 0; i < NROFATTACKS; i++)
788 if (op->resist[i])
789 return 1;
790
791 return 0;
775} 792}
776 793
777#define DICE2 (get_magic(2)==2?2:1) 794#define DICE2 (get_magic(2)==2?2:1)
778#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 795#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
779 796
816 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0); 833 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
817 /* So the treasure doesn't get created again */ 834 /* So the treasure doesn't get created again */
818 op->randomitems = 0; 835 op->randomitems = 0;
819 } 836 }
820 837
821 if (difficulty < 1) 838 max_it (difficulty, 1);
822 difficulty = 1;
823 839
824 if (INVOKE_OBJECT (ADD_BONUS, op, 840 if (INVOKE_OBJECT (ADD_BONUS, op,
825 ARG_OBJECT (creator != op ? creator : 0), 841 ARG_OBJECT (creator != op ? creator : 0),
826 ARG_INT (difficulty), ARG_INT (max_magic), 842 ARG_INT (difficulty), ARG_INT (max_magic),
827 ARG_INT (flags))) 843 ARG_INT (flags)))
886 * again below */ 902 * again below */
887 } 903 }
888 } 904 }
889 905
890 /* materialtype modifications. Note we allow this on artifacts. */ 906 /* materialtype modifications. Note we allow this on artifacts. */
891 set_materialname (op, difficulty, NULL); 907 select_material (op, difficulty);
892 908
893 if (flags & GT_MINIMAL) 909 if (flags & GT_MINIMAL)
894 { 910 {
895 if (op->type == POTION) 911 if (op->type == POTION)
896 /* Handle healing and magic power potions */ 912 /* Handle healing and magic power potions */
927 int too_many_tries = 0, is_special = 0; 943 int too_many_tries = 0, is_special = 0;
928 944
929 /* Handle healing and magic power potions */ 945 /* Handle healing and magic power potions */
930 if (op->stats.sp && !op->randomitems) 946 if (op->stats.sp && !op->randomitems)
931 { 947 {
932 object *tmp;
933
934 tmp = get_archetype (spell_mapping[op->stats.sp]); 948 object *tmp = get_archetype (spell_mapping[op->stats.sp]);
935 insert_ob_in_ob (tmp, op); 949 insert_ob_in_ob (tmp, op);
936 op->stats.sp = 0; 950 op->stats.sp = 0;
937 } 951 }
938 952
939 while (!(is_special = special_potion (op)) && !op->inv) 953 while (!(is_special = special_potion (op)) && !op->inv)
947 * since the value set on those is already correct. 961 * since the value set on those is already correct.
948 */ 962 */
949 if (op->inv && op->randomitems) 963 if (op->inv && op->randomitems)
950 { 964 {
951 /* value multiplier is same as for scrolls */ 965 /* value multiplier is same as for scrolls */
952 op->value = (op->value * op->inv->value); 966 op->value *= op->inv->value;
953 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 967 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
954 } 968 }
955 else 969 else
956 { 970 {
957 op->name = "potion"; 971 op->name = "potion";
958 op->name_pl = "potions"; 972 op->name_pl = "potions";
959 } 973 }
960 974
961 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 975 if (!(flags & GT_ONLY_GOOD) && rndm (2))
962 SET_FLAG (op, FLAG_CURSED); 976 SET_FLAG (op, FLAG_CURSED);
977
963 break; 978 break;
964 } 979 }
965 980
966 case AMULET: 981 case AMULET:
967 if (IS_ARCH (op->arch, amulet)) 982 if (IS_ARCH (op->arch, amulet))
1022 op->level = rndm (creator->level); 1037 op->level = rndm (creator->level);
1023 1038
1024 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1039 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1025 /* books w/ info are worth more! */ 1040 /* books w/ info are worth more! */
1026 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1041 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1027 /* creator related stuff */
1028
1029 /* for library, chained books. Note that some monsters have no_pick
1030 * set - we don't want to set no pick in that case.
1031 */
1032 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1033 SET_FLAG (op, FLAG_NO_PICK);
1034 if (creator->slaying && !op->slaying) /* for check_inv floors */
1035 op->slaying = creator->slaying;
1036 1042
1037 /* add exp so reading it gives xp (once) */ 1043 /* add exp so reading it gives xp (once) */
1038 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1044 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1039 } 1045 }
1046
1047 /* creator related stuff */
1048
1049 /* for library, chained books. Note that some monsters have no_pick
1050 * set - we don't want to set no pick in that case.
1051 */
1052 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1053 SET_FLAG (op, FLAG_NO_PICK);
1054 if (creator->slaying && !op->slaying) /* for check_inv floors */
1055 op->slaying = creator->slaying;
1040 break; 1056 break;
1041 1057
1042 case SPELLBOOK: 1058 case SPELLBOOK:
1043 op->value = op->value * op->inv->value; 1059 op->value = op->value * op->inv->value;
1044 /* add exp so learning gives xp */ 1060 /* add exp so learning gives xp */
1078 * 10 time multiplier). This way, the value are a bit more reasonable. 1094 * 10 time multiplier). This way, the value are a bit more reasonable.
1079 */ 1095 */
1080 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1096 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1081 /* maxhp is used to denote how many 'charges' the rod holds before */ 1097 /* maxhp is used to denote how many 'charges' the rod holds before */
1082 if (op->stats.maxhp) 1098 if (op->stats.maxhp)
1083 op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace); 1099 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1084 else 1100 else
1085 op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace); 1101 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1086 1102
1087 op->stats.hp = op->stats.maxhp; 1103 op->stats.hp = op->stats.maxhp;
1088 break; 1104 break;
1089 1105
1090 case SCROLL: 1106 case SCROLL:
1127 1143
1128/* 1144/*
1129 * Allocate and return the pointer to an empty artifactlist structure. 1145 * Allocate and return the pointer to an empty artifactlist structure.
1130 */ 1146 */
1131static artifactlist * 1147static artifactlist *
1132get_empty_artifactlist (void) 1148get_empty_artifactlist ()
1133{ 1149{
1134 return salloc0<artifactlist> (); 1150 return salloc0<artifactlist> ();
1135} 1151}
1136 1152
1137/* 1153/*
1138 * Allocate and return the pointer to an empty artifact structure. 1154 * Allocate and return the pointer to an empty artifact structure.
1139 */ 1155 */
1140static artifact * 1156static artifact *
1141get_empty_artifact (void) 1157get_empty_artifact ()
1142{ 1158{
1143 return salloc0<artifact> (); 1159 return salloc0<artifact> ();
1144} 1160}
1145 1161
1146/* 1162/*
1159 1175
1160/* 1176/*
1161 * Builds up the lists of artifacts from the file in the libdir. 1177 * Builds up the lists of artifacts from the file in the libdir.
1162 */ 1178 */
1163void 1179void
1164init_artifacts (void) 1180init_artifacts ()
1165{ 1181{
1166 static int has_been_inited = 0; 1182 static int has_been_inited = 0;
1167 char filename[MAX_BUF]; 1183 char filename[MAX_BUF];
1168 artifact *art = NULL; 1184 artifact *art = NULL;
1169 artifactlist *al; 1185 artifactlist *al;
1189 1205
1190 { 1206 {
1191 if (!strcmp (f.get_str (), "all")) 1207 if (!strcmp (f.get_str (), "all"))
1192 break; 1208 break;
1193 1209
1194 char *next, *cp = f.get_str (); 1210 const char *cp = f.get_str ();
1195 1211 char *next;
1196 do 1212 do
1197 { 1213 {
1198 if ((next = strchr (cp, ','))) 1214 if ((next = (char *)strchr (cp, ',')))
1199 *next++ = '\0'; 1215 *next++ = '\0';
1200 1216
1201 linked_char *tmp = new linked_char; 1217 linked_char *tmp = new linked_char;
1202 1218
1203 tmp->name = cp; 1219 tmp->name = cp;
1350 if (op->type == HORN || op->type == POTION) 1366 if (op->type == HORN || op->type == POTION)
1351 { 1367 {
1352 /* Remove any spells this object currently has in it */ 1368 /* Remove any spells this object currently has in it */
1353 op->destroy_inv (false); 1369 op->destroy_inv (false);
1354 1370
1355 object *tmp = arch_to_object (change->other_arch); 1371 object *tmp = change->other_arch->instance ();
1356 insert_ob_in_ob (tmp, op); 1372 insert_ob_in_ob (tmp, op);
1357 } 1373 }
1358 /* No harm setting this for potions/horns */ 1374 /* No harm setting this for potions/horns */
1359 op->other_arch = change->other_arch; 1375 op->other_arch = change->other_arch;
1360 } 1376 }
1446 op->value *= change->value; 1462 op->value *= change->value;
1447 1463
1448 if (change->materials) 1464 if (change->materials)
1449 op->materials = change->materials; 1465 op->materials = change->materials;
1450 1466
1451 if (change->materialname) 1467 if (change->material != MATERIAL_NULL)
1452 op->materialname = change->materialname; 1468 op->material = change->material;
1453 1469
1454 if (change->slaying) 1470 if (change->slaying)
1455 op->slaying = change->slaying; 1471 op->slaying = change->slaying;
1456 1472
1457 if (change->race) 1473 if (change->race)
1639 1655
1640 SET_FLAG (item, FLAG_NO_STEAL); 1656 SET_FLAG (item, FLAG_NO_STEAL);
1641 } 1657 }
1642} 1658}
1643 1659
1644/* special_potion() - so that old potion code is still done right. */ 1660static void
1645int
1646special_potion (object *op)
1647{
1648 if (op->attacktype)
1649 return 1;
1650
1651 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1652 return 1;
1653
1654 for (int i = 0; i < NROFATTACKS; i++)
1655 if (op->resist[i])
1656 return 1;
1657
1658 return 0;
1659}
1660
1661void
1662free_treasurestruct (treasure *t) 1661free_treasurestruct (treasure *t)
1663{ 1662{
1664 if (t->next) free_treasurestruct (t->next); 1663 if (t->next) free_treasurestruct (t->next);
1665 if (t->next_yes) free_treasurestruct (t->next_yes); 1664 if (t->next_yes) free_treasurestruct (t->next_yes);
1666 if (t->next_no) free_treasurestruct (t->next_no); 1665 if (t->next_no) free_treasurestruct (t->next_no);
1667 1666
1668 delete t; 1667 delete t;
1669} 1668}
1670 1669
1671void 1670static void
1672free_charlinks (linked_char *lc) 1671free_charlinks (linked_char *lc)
1673{ 1672{
1674 if (lc->next) 1673 if (lc->next)
1675 free_charlinks (lc->next); 1674 free_charlinks (lc->next);
1676 1675
1677 delete lc; 1676 delete lc;
1678} 1677}
1679 1678
1680void 1679static void
1681free_artifact (artifact *at) 1680free_artifact (artifact *at)
1682{ 1681{
1683 if (at->next) free_artifact (at->next); 1682 if (at->next) free_artifact (at->next);
1684 if (at->allowed) free_charlinks (at->allowed); 1683 if (at->allowed) free_charlinks (at->allowed);
1685 1684
1686 at->item->destroy (); 1685 at->item->destroy ();
1687 1686
1688 sfree (at); 1687 sfree (at);
1689} 1688}
1690 1689
1691void
1692free_artifactlist (artifactlist *al)
1693{
1694 artifactlist *nextal;
1695
1696 for (al = first_artifactlist; al; al = nextal)
1697 {
1698 nextal = al->next;
1699
1700 if (al->items)
1701 free_artifact (al->items);
1702
1703 sfree (al);
1704 }
1705}
1706
1707void
1708free_all_treasures (void)
1709{
1710 treasurelist *tl, *next;
1711
1712 for (tl = first_treasurelist; tl; tl = next)
1713 {
1714 clear (tl);
1715
1716 next = tl->next;
1717 delete tl;
1718 }
1719
1720 free_artifactlist (first_artifactlist);
1721}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines