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.109 by root, Sun May 2 20:37:57 2010 UTC vs.
Revision 1.123 by root, Tue Nov 27 18:50:22 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * 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 * 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 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * 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 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 26/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 27 * It is useful for finding bugs in the treasures file. Since it only
… …
34//#define TREASURE_VERBOSE 35//#define TREASURE_VERBOSE
35 36
36#include <global.h> 37#include <global.h>
37#include <treasure.h> 38#include <treasure.h>
38 39
40#include <flat_hash_map.hpp>
41
42// used only by treasure.C, does not handle null arch ptrs
43#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
44
39extern char *spell_mapping[]; 45extern char *spell_mapping[];
40 46
41static treasurelist *first_treasurelist; 47static treasurelist *first_treasurelist;
42 48
43static void change_treasure (treasure *t, object *op); /* overrule default values */ 49static void change_treasure (treasure *t, object *op); /* overrule default values */
44 50
45typedef std::tr1::unordered_map< 51typedef ska::flat_hash_map
52 <
46 const char *, 53 const char *,
47 treasurelist *, 54 treasurelist *,
48 str_hash, 55 str_hash,
49 str_equal, 56 str_equal,
50 slice_allocator< std::pair<const char *const, treasurelist *> > 57 slice_allocator< std::pair<const char *const, treasurelist *> >
51> tl_map_t; 58 > tl_map_t;
52 59
53static tl_map_t tl_map; 60static tl_map_t tl_map;
54 61
55//TODO: class method 62//TODO: class method
56static void free_treasurestruct (treasure *t); // bleh desu 63static void free_treasurestruct (treasure *t); // bleh desu
… …
490 { 0, 0, 0, 3, 97}, // 29 497 { 0, 0, 0, 3, 97}, // 29
491 { 0, 0, 0, 0, 100}, // 30 498 { 0, 0, 0, 0, 100}, // 30
492 { 0, 0, 0, 0, 100}, // 31 499 { 0, 0, 0, 0, 100}, // 31
493}; 500};
494 501
495/* calculate the appropriate level for wands staves and scrolls. 502/* calculate the appropriate level for wands staves and scrolls.
496 * This code presumes that op has had its spell object created (in op->inv) 503 * This code presumes that op has had its spell object created (in op->inv)
497 * 504 *
498 * elmex Wed Aug 9 17:44:59 CEST 2006: 505 * elmex Wed Aug 9 17:44:59 CEST 2006:
499 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 506 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
500 */ 507 */
… …
775 return 1; 782 return 1;
776 783
777 return 0; 784 return 0;
778} 785}
779 786
787static double
788value_factor_from_spell_item (object *spell, object *item)
789{
790 double factor =
791 pow ((spell->value > 0 ? spell->value : 1)
792 * spell->level, 1.5);
793
794 if (item) // this if for: wands/staffs/rods:
795 {
796 /* Old crossfire comment ahead:
797 * Add 50 to both level an divisor to keep prices a little more
798 * reasonable. Otherwise, a high level version of a low level
799 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
800 * 10 time multiplier). This way, the value are a bit more reasonable.
801 */
802
803 factor *= item->level + 50;
804 factor /= item->inv->level + 50;
805 }
806
807 return factor;
808}
809
780#define DICE2 (get_magic(2) == 2 ? 2 : 1) 810#define DICE2 (get_magic(2) == 2 ? 2 : 1)
781#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 811#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
782 812
783/* 813/*
784 * fix_generated_item(): This is called after an item is generated, in 814 * fix_generated_item(): This is called after an item is generated, in
785 * order to set it up right. This produced magical bonuses, puts spells 815 * order to set it up right. This produced magical bonuses, puts spells
786 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 816 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
787 */ 817 */
788 818
789/* 4/28/96 added creator object from which op may now inherit properties based on 819/* 4/28/96 added creator object from which op may now inherit properties based on
790 * op->type. Right now, which stuff the creator passes on is object type 820 * op->type. Right now, which stuff the creator passes on is object type
791 * dependant. I know this is a spagetti manuever, but is there a cleaner 821 * dependant. I know this is a spagetti manuever, but is there a cleaner
792 * way to do this? b.t. */ 822 * way to do this? b.t. */
793 823
794/* 824/*
795 * ! (flags & GT_ENVIRONMENT): 825 * ! (flags & GT_ENVIRONMENT):
796 * Automatically calls fix_flesh_item(). 826 * Automatically calls fix_flesh_item().
… …
896 { 926 {
897 if (op->type == POTION) 927 if (op->type == POTION)
898 /* Handle healing and magic power potions */ 928 /* Handle healing and magic power potions */
899 if (op->stats.sp && !op->randomitems) 929 if (op->stats.sp && !op->randomitems)
900 { 930 {
901 object *tmp = get_archetype (spell_mapping [op->stats.sp]); 931 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
902 insert_ob_in_ob (tmp, op); 932 insert_ob_in_ob (tmp, op);
903 op->stats.sp = 0; 933 op->stats.sp = 0;
904 } 934 }
905 } 935 }
906 else if (!op->title) /* Only modify object if not special */ 936 else if (!op->title) /* Only modify object if not special */
… …
924 } 954 }
925 break; 955 break;
926 956
927 case POTION: 957 case POTION:
928 { 958 {
929 int too_many_tries = 0, is_special = 0; 959 int too_many_tries = 0;
930 960
931 /* Handle healing and magic power potions */ 961 /* Handle healing and magic power potions */
932 if (op->stats.sp && !op->randomitems) 962 if (op->stats.sp && !op->randomitems)
933 { 963 {
934 object *tmp = get_archetype (spell_mapping[op->stats.sp]); 964 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
935 insert_ob_in_ob (tmp, op); 965 insert_ob_in_ob (tmp, op);
936 op->stats.sp = 0; 966 op->stats.sp = 0;
937 } 967 }
938 968
939 while (!(is_special = special_potion (op)) && !op->inv) 969 while (!special_potion (op) && !op->inv)
940 { 970 {
941 generate_artifact (op, difficulty); 971 generate_artifact (op, difficulty);
942 if (too_many_tries++ > 10) 972 if (too_many_tries++ > 10)
943 break; 973 break;
944 } 974 }
… …
1041 if (creator->slaying && !op->slaying) /* for check_inv floors */ 1071 if (creator->slaying && !op->slaying) /* for check_inv floors */
1042 op->slaying = creator->slaying; 1072 op->slaying = creator->slaying;
1043 break; 1073 break;
1044 1074
1045 case SPELLBOOK: 1075 case SPELLBOOK:
1046 op->value *= pow ((op->inv->value > 0 ? op->inv->value : 1) 1076 op->value *= value_factor_from_spell_item (op->inv, 0);
1047 * op->inv->level,
1048 1.5);
1049 1077
1050 /* add exp so learning gives xp */ 1078 /* add exp so learning gives xp */
1051 op->level = op->inv->level; 1079 op->level = op->inv->level;
1052 op->stats.exp = op->value; 1080 op->stats.exp = op->value;
1053 break; 1081 break;
… …
1058 * and reset nrof. 1086 * and reset nrof.
1059 */ 1087 */
1060 op->stats.food = op->inv->nrof; 1088 op->stats.food = op->inv->nrof;
1061 op->nrof = 1; 1089 op->nrof = 1;
1062 /* If the spell changes by level, choose a random level 1090 /* If the spell changes by level, choose a random level
1063 * for it, and adjust price. If the spell doesn't 1091 * for it.
1064 * change by level, just set the wand to the level of
1065 * the spell, and value calculation is simpler.
1066 */ 1092 */
1067 if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier) 1093 if (op->inv->duration_modifier
1068 { 1094 || op->inv->dam_modifier
1095 || op->inv->range_modifier)
1069 op->level = level_for_item (op, difficulty); 1096 op->level = level_for_item (op, difficulty);
1070 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1071 }
1072 else 1097 else
1073 {
1074 op->level = op->inv->level; 1098 op->level = op->inv->level;
1075 op->value = op->value * op->inv->value; 1099
1076 } 1100 op->value *= value_factor_from_spell_item (op->inv, op);
1077 break; 1101 break;
1078 1102
1079 case ROD: 1103 case ROD:
1080 op->level = level_for_item (op, difficulty); 1104 op->level = level_for_item (op, difficulty);
1081 /* Add 50 to both level an divisor to keep prices a little more 1105 op->value *= value_factor_from_spell_item (op->inv, op);
1082 * reasonable. Otherwise, a high level version of a low level
1083 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1084 * 10 time multiplier). This way, the value are a bit more reasonable.
1085 */
1086 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1087 1106
1088 /* maxhp is used to denote how many 'charges' the rod holds before */ 1107 /* maxhp is used to denote how many 'charges' the rod holds before */
1089 if (op->stats.maxhp) 1108 if (op->stats.maxhp)
1090 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace); 1109 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1091 else 1110 else
… …
1094 op->stats.hp = op->stats.maxhp; 1113 op->stats.hp = op->stats.maxhp;
1095 break; 1114 break;
1096 1115
1097 case SCROLL: 1116 case SCROLL:
1098 op->level = level_for_item (op, difficulty); 1117 op->level = level_for_item (op, difficulty);
1099 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1118 op->value *= value_factor_from_spell_item (op->inv, op);
1100 1119
1101 /* add exp so reading them properly gives xp */ 1120 /* add exp so reading them properly gives xp */
1102 op->stats.exp = op->value / 5; 1121 op->stats.exp = op->value / 5;
1103 op->nrof = op->inv->nrof; 1122 op->nrof = op->inv->nrof;
1104 break; 1123 break;
… …
1477 name = tmp->name + 1, neg = 1; 1496 name = tmp->name + 1, neg = 1;
1478 else 1497 else
1479 name = tmp->name, neg = 0; 1498 name = tmp->name, neg = 0;
1480 1499
1481 /* If we match name, then return the opposite of 'neg' */ 1500 /* If we match name, then return the opposite of 'neg' */
1482 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname))) 1501 if (!strcmp (name, op->arch->archname))
1483 return !neg; 1502 return !neg;
1484 1503
1485 /* Set success as true, since if the match was an inverse, it means 1504 /* Set success as true, since if the match was an inverse, it means
1486 * everything is allowed except what we match 1505 * everything is allowed except what we match
1487 */ 1506 */

Diff Legend

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