1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | 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, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
|
|
24 | #define ALLOWED_COMBINATION |
|
|
25 | |
24 | |
26 | /* TREASURE_DEBUG does some checking on the treasurelists after loading. |
25 | /* TREASURE_DEBUG does some checking on the treasurelists after loading. |
27 | * It is useful for finding bugs in the treasures file. Since it only |
26 | * It is useful for finding bugs in the treasures file. Since it only |
28 | * slows the startup some (and not actual game play), it is by default |
27 | * slows the startup some (and not actual game play), it is by default |
29 | * left on |
28 | * left on |
30 | */ |
29 | */ |
31 | #define TREASURE_DEBUG |
30 | #define TREASURE_DEBUG |
32 | |
31 | |
33 | /* TREASURE_VERBOSE enables copious output concerning artifact generation */ |
32 | /* TREASURE_VERBOSE enables copious output concerning artifact generation */ |
34 | |
33 | |
35 | /* #define TREASURE_VERBOSE */ |
34 | //#define TREASURE_VERBOSE |
36 | |
35 | |
37 | #include <global.h> |
36 | #include <global.h> |
38 | #include <treasure.h> |
37 | #include <treasure.h> |
39 | #include <funcpoint.h> |
38 | #include <funcpoint.h> |
40 | #include <loader.h> |
39 | #include <loader.h> |
41 | |
40 | |
|
|
41 | extern char *spell_mapping[]; |
|
|
42 | |
|
|
43 | static treasurelist *first_treasurelist; |
42 | |
44 | |
43 | static void change_treasure (treasure *t, object *op); /* overrule default values */ |
45 | static void change_treasure (treasure *t, object *op); /* overrule default values */ |
44 | extern char *spell_mapping[]; |
|
|
45 | |
46 | |
46 | /* |
47 | typedef std::tr1::unordered_map< |
47 | * Initialize global archtype pointers: |
48 | const char *, |
48 | */ |
49 | treasurelist *, |
|
|
50 | str_hash, |
|
|
51 | str_equal, |
|
|
52 | slice_allocator< std::pair<const char *const, treasurelist *> >, |
|
|
53 | true |
|
|
54 | > tl_map_t; |
49 | |
55 | |
|
|
56 | static tl_map_t tl_map; |
|
|
57 | |
|
|
58 | /* |
|
|
59 | * Searches for the given treasurelist |
|
|
60 | */ |
|
|
61 | treasurelist * |
|
|
62 | treasurelist::find (const char *name) |
|
|
63 | { |
|
|
64 | if (!name) |
|
|
65 | return 0; |
|
|
66 | |
|
|
67 | auto (i, tl_map.find (name)); |
|
|
68 | |
|
|
69 | if (i == tl_map.end ()) |
|
|
70 | return 0; |
|
|
71 | |
|
|
72 | return i->second; |
|
|
73 | } |
|
|
74 | |
|
|
75 | /* |
|
|
76 | * Searches for the given treasurelist in the globally linked list |
|
|
77 | * of treasurelists which has been built by load_treasures(). |
|
|
78 | */ |
|
|
79 | treasurelist * |
|
|
80 | treasurelist::get (const char *name) |
|
|
81 | { |
|
|
82 | treasurelist *tl = find (name); |
|
|
83 | |
|
|
84 | if (!tl) |
|
|
85 | { |
|
|
86 | tl = new treasurelist; |
|
|
87 | |
|
|
88 | tl->name = name; |
|
|
89 | tl->next = first_treasurelist; |
|
|
90 | first_treasurelist = tl; |
|
|
91 | |
|
|
92 | tl_map.insert (std::make_pair (tl->name, tl)); |
|
|
93 | } |
|
|
94 | |
|
|
95 | return tl; |
|
|
96 | } |
|
|
97 | |
|
|
98 | //TODO: class method |
50 | void |
99 | void |
51 | init_archetype_pointers () |
100 | clear (treasurelist *tl) |
52 | { |
101 | { |
53 | int prev_warn = warn_archetypes; |
102 | if (tl->items) |
|
|
103 | { |
|
|
104 | free_treasurestruct (tl->items); |
|
|
105 | tl->items = 0; |
|
|
106 | } |
54 | |
107 | |
55 | warn_archetypes = 1; |
|
|
56 | if (ring_arch == NULL) |
|
|
57 | ring_arch = archetype::find ("ring"); |
|
|
58 | if (amulet_arch == NULL) |
|
|
59 | amulet_arch = archetype::find ("amulet"); |
|
|
60 | if (staff_arch == NULL) |
|
|
61 | staff_arch = archetype::find ("staff"); |
|
|
62 | if (crown_arch == NULL) |
|
|
63 | crown_arch = archetype::find ("crown"); |
|
|
64 | warn_archetypes = prev_warn; |
|
|
65 | } |
|
|
66 | |
|
|
67 | /* |
|
|
68 | * Allocate and return the pointer to an empty treasurelist structure. |
|
|
69 | */ |
|
|
70 | |
|
|
71 | static treasurelist * |
|
|
72 | get_empty_treasurelist (void) |
|
|
73 | { |
|
|
74 | return new treasurelist; |
|
|
75 | } |
|
|
76 | |
|
|
77 | /* |
|
|
78 | * Allocate and return the pointer to an empty treasure structure. |
|
|
79 | */ |
|
|
80 | //TODO: make this a constructor |
|
|
81 | static treasure * |
|
|
82 | get_empty_treasure (void) |
|
|
83 | { |
|
|
84 | treasure *t = new treasure; |
|
|
85 | |
|
|
86 | t->chance = 100; |
108 | tl->total_chance = 0; |
87 | |
|
|
88 | return t; |
|
|
89 | } |
109 | } |
|
|
110 | |
|
|
111 | #ifdef TREASURE_DEBUG |
|
|
112 | /* recursived checks the linked list. Treasurelist is passed only |
|
|
113 | * so that the treasure name can be printed out |
|
|
114 | */ |
|
|
115 | static void |
|
|
116 | check_treasurelist (const treasure *t, const treasurelist * tl) |
|
|
117 | { |
|
|
118 | if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) |
|
|
119 | LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); |
|
|
120 | |
|
|
121 | if (t->next) |
|
|
122 | check_treasurelist (t->next, tl); |
|
|
123 | |
|
|
124 | if (t->next_yes) |
|
|
125 | check_treasurelist (t->next_yes, tl); |
|
|
126 | |
|
|
127 | if (t->next_no) |
|
|
128 | check_treasurelist (t->next_no, tl); |
|
|
129 | } |
|
|
130 | #endif |
90 | |
131 | |
91 | /* |
132 | /* |
92 | * Reads the lib/treasure file from disk, and parses the contents |
133 | * Reads the lib/treasure file from disk, and parses the contents |
93 | * into an internal treasure structure (very linked lists) |
134 | * into an internal treasure structure (very linked lists) |
94 | */ |
135 | */ |
95 | |
|
|
96 | static treasure * |
136 | static treasure * |
97 | load_treasure (FILE * fp, int *line) |
137 | read_treasure (object_thawer &f) |
98 | { |
138 | { |
99 | char buf[MAX_BUF], *cp, variable[MAX_BUF]; |
|
|
100 | treasure *t = get_empty_treasure (); |
139 | treasure *t = new treasure; |
101 | int value; |
|
|
102 | |
140 | |
103 | nroftreasures++; |
141 | f.next (); |
104 | while (fgets (buf, MAX_BUF, fp) != NULL) |
|
|
105 | { |
|
|
106 | (*line)++; |
|
|
107 | |
142 | |
108 | if (*buf == '#') |
143 | for (;;) |
109 | continue; |
144 | { |
110 | if ((cp = strchr (buf, '\n')) != NULL) |
145 | coroapi::cede_to_tick_every (10); |
111 | *cp = '\0'; |
|
|
112 | cp = buf; |
|
|
113 | while (isspace (*cp)) /* Skip blanks */ |
|
|
114 | cp++; |
|
|
115 | |
146 | |
116 | if (sscanf (cp, "arch %s", variable)) |
147 | switch (f.kw) |
117 | { |
|
|
118 | if ((t->item = archetype::find (variable)) == NULL) |
|
|
119 | LOG (llevError, "Treasure lacks archetype: %s\n", variable); |
|
|
120 | } |
148 | { |
121 | else if (sscanf (cp, "list %s", variable)) |
149 | case KW_arch: |
122 | t->name = variable; |
150 | t->item = archetype::get (f.get_str ()); |
123 | else if (sscanf (cp, "change_name %s", variable)) |
151 | break; |
124 | t->change_arch.name = variable; |
152 | |
125 | else if (sscanf (cp, "change_title %s", variable)) |
153 | case KW_list: f.get (t->name); break; |
126 | t->change_arch.title = variable; |
154 | case KW_change_name: f.get (t->change_arch.name); break; |
127 | else if (sscanf (cp, "change_slaying %s", variable)) |
155 | case KW_change_title: f.get (t->change_arch.title); break; |
128 | t->change_arch.slaying = variable; |
156 | case KW_change_slaying: f.get (t->change_arch.slaying); break; |
129 | else if (sscanf (cp, "chance %d", &value)) |
157 | case KW_chance: f.get (t->chance); break; |
130 | t->chance = (uint8) value; |
158 | case KW_nrof: f.get (t->nrof); break; |
131 | else if (sscanf (cp, "nrof %d", &value)) |
159 | case KW_magic: f.get (t->magic); break; |
132 | t->nrof = (uint16) value; |
160 | |
133 | else if (sscanf (cp, "magic %d", &value)) |
161 | case KW_yes: t->next_yes = read_treasure (f); continue; |
134 | t->magic = (uint8) value; |
162 | case KW_no: t->next_no = read_treasure (f); continue; |
135 | else if (!strcmp (cp, "yes")) |
163 | |
136 | t->next_yes = load_treasure (fp, line); |
164 | case KW_end: |
137 | else if (!strcmp (cp, "no")) |
165 | f.next (); |
138 | t->next_no = load_treasure (fp, line); |
|
|
139 | else if (!strcmp (cp, "end")) |
|
|
140 | return t; |
|
|
141 | else if (!strcmp (cp, "more")) |
|
|
142 | { |
|
|
143 | t->next = load_treasure (fp, line); |
|
|
144 | return t; |
166 | return t; |
145 | } |
|
|
146 | else |
|
|
147 | LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line); |
|
|
148 | } |
|
|
149 | LOG (llevError, "treasure lacks 'end'.\n"); |
|
|
150 | return t; |
|
|
151 | } |
|
|
152 | |
167 | |
153 | #ifdef TREASURE_DEBUG |
168 | case KW_more: |
|
|
169 | t->next = read_treasure (f); |
|
|
170 | return t; |
154 | |
171 | |
155 | /* recursived checks the linked list. Treasurelist is passed only |
172 | default: |
156 | * so that the treasure name can be printed out |
173 | if (!f.parse_error ("treasurelist", t->name)) |
157 | */ |
174 | return 0; |
158 | static void |
|
|
159 | check_treasurelist (const treasure *t, const treasurelist * tl) |
|
|
160 | { |
|
|
161 | if (t->item == NULL && t->name == NULL) |
|
|
162 | LOG (llevError, "Treasurelist %s has element with no name or archetype\n", &tl->name); |
|
|
163 | if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) |
|
|
164 | LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); |
|
|
165 | /* find_treasurelist will print out its own error message */ |
|
|
166 | if (t->name && *t->name) |
|
|
167 | (void) find_treasurelist (t->name); |
|
|
168 | if (t->next) |
|
|
169 | check_treasurelist (t->next, tl); |
|
|
170 | if (t->next_yes) |
|
|
171 | check_treasurelist (t->next_yes, tl); |
|
|
172 | if (t->next_no) |
|
|
173 | check_treasurelist (t->next_no, tl); |
|
|
174 | } |
|
|
175 | #endif |
|
|
176 | |
175 | |
|
|
176 | return t; |
|
|
177 | } |
|
|
178 | |
|
|
179 | f.next (); |
|
|
180 | } |
|
|
181 | } |
|
|
182 | |
177 | /* |
183 | /* |
178 | * Opens LIBDIR/treasure and reads all treasure-declarations from it. |
|
|
179 | * Each treasure is parsed with the help of load_treasure(). |
184 | * Each treasure is parsed with the help of load_treasure(). |
180 | */ |
185 | */ |
181 | |
186 | treasurelist * |
182 | void |
187 | treasurelist::read (object_thawer &f) |
183 | load_treasures (void) |
|
|
184 | { |
188 | { |
185 | FILE *fp; |
189 | assert (f.kw == KW_treasure || f.kw == KW_treasureone); |
186 | char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF]; |
|
|
187 | treasurelist *previous = NULL; |
|
|
188 | treasure *t; |
|
|
189 | int comp, line = 0; |
|
|
190 | |
190 | |
191 | sprintf (filename, "%s/%s", settings.datadir, settings.treasures); |
191 | bool one = f.kw == KW_treasureone; |
192 | if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) |
192 | treasurelist *tl = treasurelist::get (f.get_str ()); |
193 | { |
193 | clear (tl); |
194 | LOG (llevError, "Can't open treasure file.\n"); |
194 | tl->items = read_treasure (f); |
|
|
195 | if (!tl->items) |
195 | return; |
196 | return 0; |
196 | } |
|
|
197 | while (fgets (buf, MAX_BUF, fp) != NULL) |
|
|
198 | { |
|
|
199 | line++; |
|
|
200 | if (*buf == '#') |
|
|
201 | continue; |
|
|
202 | |
197 | |
203 | if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name)) |
|
|
204 | { |
|
|
205 | treasurelist *tl = get_empty_treasurelist (); |
|
|
206 | |
|
|
207 | tl->name = name; |
|
|
208 | if (previous == NULL) |
|
|
209 | first_treasurelist = tl; |
|
|
210 | else |
|
|
211 | previous->next = tl; |
|
|
212 | previous = tl; |
|
|
213 | tl->items = load_treasure (fp, &line); |
|
|
214 | |
|
|
215 | /* This is a one of the many items on the list should be generated. |
198 | /* This is a one of the many items on the list should be generated. |
216 | * Add up the chance total, and check to make sure the yes & no |
199 | * Add up the chance total, and check to make sure the yes & no |
217 | * fields of the treasures are not being used. |
200 | * fields of the treasures are not being used. |
218 | */ |
201 | */ |
219 | if (!strncmp (buf, "treasureone", 11)) |
202 | if (one) |
|
|
203 | { |
|
|
204 | for (treasure *t = tl->items; t; t = t->next) |
|
|
205 | { |
|
|
206 | if (t->next_yes || t->next_no) |
220 | { |
207 | { |
221 | for (t = tl->items; t != NULL; t = t->next) |
|
|
222 | { |
|
|
223 | #ifdef TREASURE_DEBUG |
|
|
224 | if (t->next_yes || t->next_no) |
|
|
225 | { |
|
|
226 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); |
208 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); |
227 | LOG (llevError, " the next_yes or next_no field is set\n"); |
209 | LOG (llevError, " the next_yes or next_no field is set\n"); |
228 | } |
|
|
229 | #endif |
|
|
230 | tl->total_chance += t->chance; |
|
|
231 | } |
|
|
232 | } |
210 | } |
233 | } |
|
|
234 | else |
|
|
235 | LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line); |
|
|
236 | } |
|
|
237 | close_and_delete (fp, comp); |
|
|
238 | |
211 | |
239 | #ifdef TREASURE_DEBUG |
212 | tl->total_chance += t->chance; |
240 | /* Perform some checks on how valid the treasure data actually is. |
213 | } |
241 | * verify that list transitions work (ie, the list that it is supposed |
214 | } |
242 | * to transition to exists). Also, verify that at least the name |
|
|
243 | * or archetype is set for each treasure element. |
|
|
244 | */ |
|
|
245 | for (previous = first_treasurelist; previous != NULL; previous = previous->next) |
|
|
246 | check_treasurelist (previous->items, previous); |
|
|
247 | #endif |
|
|
248 | } |
|
|
249 | |
215 | |
250 | /* |
|
|
251 | * Searches for the given treasurelist in the globally linked list |
|
|
252 | * of treasurelists which has been built by load_treasures(). |
|
|
253 | */ |
|
|
254 | |
|
|
255 | treasurelist * |
|
|
256 | find_treasurelist (const char *name) |
|
|
257 | { |
|
|
258 | shstr_cmp name_ (name); |
|
|
259 | |
|
|
260 | if (!name_) |
|
|
261 | return 0; |
|
|
262 | |
|
|
263 | for (treasurelist * tl = first_treasurelist; tl != 0; tl = tl->next) |
|
|
264 | if (name_ == tl->name) |
|
|
265 | return tl; |
|
|
266 | |
|
|
267 | if (first_treasurelist) |
|
|
268 | LOG (llevError, "Couldn't find treasurelist %s\n", name); |
|
|
269 | |
|
|
270 | return 0; |
216 | return tl; |
271 | } |
217 | } |
272 | |
|
|
273 | |
218 | |
274 | /* |
219 | /* |
275 | * Generates the objects specified by the given treasure. |
220 | * Generates the objects specified by the given treasure. |
276 | * It goes recursively through the rest of the linked list. |
221 | * It goes recursively through the rest of the linked list. |
277 | * If there is a certain percental chance for a treasure to be generated, |
222 | * If there is a certain percental chance for a treasure to be generated, |
… | |
… | |
280 | * being generated. |
225 | * being generated. |
281 | * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only |
226 | * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only |
282 | * abilities. This is used by summon spells, thus no summoned monsters |
227 | * abilities. This is used by summon spells, thus no summoned monsters |
283 | * start with equipment, but only their abilities). |
228 | * start with equipment, but only their abilities). |
284 | */ |
229 | */ |
285 | |
|
|
286 | |
|
|
287 | static void |
230 | static void |
288 | put_treasure (object *op, object *creator, int flags) |
231 | put_treasure (object *op, object *creator, int flags) |
289 | { |
232 | { |
290 | object *tmp; |
233 | if (flags & GT_ENVIRONMENT) |
291 | |
234 | { |
292 | /* Bit of a hack - spells should never be put onto the map. The entire |
235 | /* Bit of a hack - spells should never be put onto the map. The entire |
293 | * treasure stuff is a problem - there is no clear idea of knowing |
236 | * treasure stuff is a problem - there is no clear idea of knowing |
294 | * this is the original object, or if this is an object that should be created |
237 | * this is the original object, or if this is an object that should be created |
295 | * by another object. |
238 | * by another object. |
296 | */ |
239 | */ |
297 | if (flags & GT_ENVIRONMENT && op->type != SPELL) |
240 | //TODO: flag such as objects... as such (no drop, anybody?) |
298 | { |
241 | if (op->type == SPELL) |
299 | op->x = creator->x; |
242 | { |
300 | op->y = creator->y; |
243 | op->destroy (); |
|
|
244 | return; |
|
|
245 | } |
|
|
246 | |
|
|
247 | op->expand_tail (); |
|
|
248 | |
|
|
249 | if (ob_blocked (op, creator->map, creator->x, creator->y)) |
|
|
250 | op->destroy (); |
|
|
251 | else |
|
|
252 | { |
301 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
253 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
302 | insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON); |
254 | op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); |
|
|
255 | } |
303 | } |
256 | } |
304 | else |
257 | else |
305 | { |
258 | { |
306 | op = insert_ob_in_ob (op, creator); |
259 | op = creator->insert (op); |
|
|
260 | |
307 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
261 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
308 | monster_check_apply (creator, op); |
262 | monster_check_apply (creator, op); |
309 | if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL) |
263 | |
|
|
264 | if (flags & GT_UPDATE_INV) |
|
|
265 | if (object *tmp = creator->in_player ()) |
310 | esrv_send_item (tmp, op); |
266 | esrv_send_item (tmp, op); |
311 | } |
267 | } |
312 | } |
268 | } |
313 | |
269 | |
314 | /* if there are change_xxx commands in the treasure, we include the changes |
270 | /* if there are change_xxx commands in the treasure, we include the changes |
315 | * in the generated object |
271 | * in the generated object |
… | |
… | |
329 | |
285 | |
330 | if (t->change_arch.slaying) |
286 | if (t->change_arch.slaying) |
331 | op->slaying = t->change_arch.slaying; |
287 | op->slaying = t->change_arch.slaying; |
332 | } |
288 | } |
333 | |
289 | |
334 | void |
290 | static void |
335 | create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) |
291 | create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) |
336 | { |
292 | { |
337 | object *tmp; |
|
|
338 | |
|
|
339 | if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) |
293 | if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) |
340 | { |
294 | { |
341 | if (t->name) |
295 | if (t->name) |
342 | { |
296 | { |
343 | if (strcmp (t->name, "NONE") && difficulty >= t->magic) |
297 | if (difficulty >= t->magic) |
|
|
298 | if (treasurelist *tl = treasurelist::find (t->name)) |
344 | create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); |
299 | create_treasure (tl, op, flag, difficulty, tries); |
|
|
300 | else |
|
|
301 | LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); |
345 | } |
302 | } |
346 | else |
303 | else |
347 | { |
304 | { |
348 | if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)) |
305 | if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) |
349 | { |
306 | { |
350 | tmp = arch_to_object (t->item); |
307 | object *tmp = arch_to_object (t->item); |
|
|
308 | |
351 | if (t->nrof && tmp->nrof <= 1) |
309 | if (t->nrof && tmp->nrof <= 1) |
352 | tmp->nrof = RANDOM () % ((int) t->nrof) + 1; |
310 | tmp->nrof = rndm (t->nrof) + 1; |
|
|
311 | |
353 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
312 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
354 | change_treasure (t, tmp); |
313 | change_treasure (t, tmp); |
355 | put_treasure (tmp, op, flag); |
314 | put_treasure (tmp, op, flag); |
356 | } |
315 | } |
357 | } |
316 | } |
358 | |
317 | |
359 | if (t->next_yes != NULL) |
318 | if (t->next_yes) |
360 | create_all_treasures (t->next_yes, op, flag, difficulty, tries); |
319 | create_all_treasures (t->next_yes, op, flag, difficulty, tries); |
361 | } |
320 | } |
362 | else if (t->next_no != NULL) |
321 | else if (t->next_no) |
363 | create_all_treasures (t->next_no, op, flag, difficulty, tries); |
322 | create_all_treasures (t->next_no, op, flag, difficulty, tries); |
364 | |
323 | |
365 | if (t->next != NULL) |
324 | if (t->next) |
366 | create_all_treasures (t->next, op, flag, difficulty, tries); |
325 | create_all_treasures (t->next, op, flag, difficulty, tries); |
367 | } |
326 | } |
368 | |
327 | |
369 | void |
328 | static void |
370 | create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) |
329 | create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) |
371 | { |
330 | { |
372 | int value = RANDOM () % tl->total_chance; |
331 | int value = rndm (tl->total_chance); |
373 | treasure *t; |
332 | treasure *t; |
374 | |
333 | |
375 | if (tries++ > 100) |
334 | if (tries++ > 100) |
376 | { |
335 | { |
377 | LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); |
336 | LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); |
378 | return; |
337 | return; |
379 | } |
338 | } |
380 | |
339 | |
381 | for (t = tl->items; t != NULL; t = t->next) |
340 | for (t = tl->items; t; t = t->next) |
382 | { |
341 | { |
383 | value -= t->chance; |
342 | value -= t->chance; |
384 | |
343 | |
385 | if (value < 0) |
344 | if (value < 0) |
386 | break; |
345 | break; |
387 | } |
346 | } |
388 | |
347 | |
389 | if (!t || value >= 0) |
348 | if (!t || value >= 0) |
390 | { |
|
|
391 | LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); |
349 | cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1); |
392 | abort (); |
|
|
393 | return; |
|
|
394 | } |
|
|
395 | |
350 | |
396 | if (t->name) |
351 | if (t->name) |
397 | { |
352 | { |
398 | if (!strcmp (t->name, "NONE")) |
|
|
399 | return; |
|
|
400 | |
|
|
401 | if (difficulty >= t->magic) |
353 | if (difficulty >= t->magic) |
|
|
354 | { |
|
|
355 | treasurelist *tl = treasurelist::find (t->name); |
|
|
356 | if (tl) |
402 | create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); |
357 | create_treasure (tl, op, flag, difficulty, tries); |
|
|
358 | } |
403 | else if (t->nrof) |
359 | else if (t->nrof) |
404 | create_one_treasure (tl, op, flag, difficulty, tries); |
360 | create_one_treasure (tl, op, flag, difficulty, tries); |
405 | |
|
|
406 | return; |
|
|
407 | } |
361 | } |
408 | |
|
|
409 | if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE) |
362 | else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) |
410 | { |
363 | { |
411 | object *tmp = arch_to_object (t->item); |
364 | if (object *tmp = arch_to_object (t->item)) |
412 | |
365 | { |
413 | if (!tmp) |
|
|
414 | return; |
|
|
415 | |
|
|
416 | if (t->nrof && tmp->nrof <= 1) |
366 | if (t->nrof && tmp->nrof <= 1) |
417 | tmp->nrof = RANDOM () % ((int) t->nrof) + 1; |
367 | tmp->nrof = rndm (t->nrof) + 1; |
418 | |
368 | |
419 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
369 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
420 | change_treasure (t, tmp); |
370 | change_treasure (t, tmp); |
421 | put_treasure (tmp, op, flag); |
371 | put_treasure (tmp, op, flag); |
|
|
372 | } |
422 | } |
373 | } |
|
|
374 | } |
|
|
375 | |
|
|
376 | void |
|
|
377 | object::create_treasure (treasurelist *tl, int flags) |
|
|
378 | { |
|
|
379 | ::create_treasure (tl, this, flags, map ? map->difficulty : 0); |
423 | } |
380 | } |
424 | |
381 | |
425 | /* This calls the appropriate treasure creation function. tries is passed |
382 | /* This calls the appropriate treasure creation function. tries is passed |
426 | * to determine how many list transitions or attempts to create treasure |
383 | * to determine how many list transitions or attempts to create treasure |
427 | * have been made. It is really in place to prevent infinite loops with |
384 | * have been made. It is really in place to prevent infinite loops with |
428 | * list transitions, or so that excessively good treasure will not be |
385 | * list transitions, or so that excessively good treasure will not be |
429 | * created on weak maps, because it will exceed the number of allowed tries |
386 | * created on weak maps, because it will exceed the number of allowed tries |
430 | * to do that. |
387 | * to do that. |
431 | */ |
388 | */ |
432 | void |
389 | void |
433 | create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries) |
390 | create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) |
434 | { |
391 | { |
|
|
392 | // empty treasurelists are legal |
|
|
393 | if (!tl->items) |
|
|
394 | return; |
435 | |
395 | |
436 | if (tries++ > 100) |
396 | if (tries++ > 100) |
437 | { |
397 | { |
438 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
398 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
439 | return; |
399 | return; |
440 | } |
400 | } |
|
|
401 | |
|
|
402 | if (op->flag [FLAG_TREASURE_ENV]) |
|
|
403 | { |
|
|
404 | // do not generate items when there already is something above the object |
|
|
405 | if (op->flag [FLAG_IS_FLOOR] && op->above) |
|
|
406 | return; |
|
|
407 | |
|
|
408 | flag |= GT_ENVIRONMENT; |
|
|
409 | } |
|
|
410 | |
441 | if (t->total_chance) |
411 | if (tl->total_chance) |
442 | create_one_treasure (t, op, flag, difficulty, tries); |
412 | create_one_treasure (tl, op, flag, difficulty, tries); |
443 | else |
413 | else |
444 | create_all_treasures (t->items, op, flag, difficulty, tries); |
414 | create_all_treasures (tl->items, op, flag, difficulty, tries); |
445 | } |
415 | } |
446 | |
416 | |
447 | /* This is similar to the old generate treasure function. However, |
417 | /* This is similar to the old generate treasure function. However, |
448 | * it instead takes a treasurelist. It is really just a wrapper around |
418 | * it instead takes a treasurelist. It is really just a wrapper around |
449 | * create_treasure. We create a dummy object that the treasure gets |
419 | * create_treasure. We create a dummy object that the treasure gets |
450 | * inserted into, and then return that treausre |
420 | * inserted into, and then return that treausre |
451 | */ |
421 | */ |
452 | object * |
422 | object * |
453 | generate_treasure (treasurelist * t, int difficulty) |
423 | generate_treasure (treasurelist *tl, int difficulty) |
454 | { |
424 | { |
455 | object *ob = get_object (), *tmp; |
425 | difficulty = clamp (difficulty, 1, settings.max_level); |
456 | |
426 | |
|
|
427 | object *ob = object::create (); |
|
|
428 | |
457 | create_treasure (t, ob, 0, difficulty, 0); |
429 | create_treasure (tl, ob, 0, difficulty, 0); |
458 | |
430 | |
459 | /* Don't want to free the object we are about to return */ |
431 | /* Don't want to free the object we are about to return */ |
460 | tmp = ob->inv; |
432 | object *tmp = ob->inv; |
461 | if (tmp != NULL) |
433 | if (tmp) |
462 | remove_ob (tmp); |
434 | tmp->remove (); |
|
|
435 | |
463 | if (ob->inv) |
436 | if (ob->inv) |
464 | { |
|
|
465 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
437 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
466 | } |
438 | |
467 | free_object (ob); |
439 | ob->destroy (); |
468 | return tmp; |
440 | return tmp; |
469 | } |
441 | } |
470 | |
442 | |
471 | /* |
443 | /* |
472 | * This is a new way of calculating the chance for an item to have |
444 | * This is a new way of calculating the chance for an item to have |
… | |
… | |
474 | * The array has two arguments, the difficulty of the level, and the |
446 | * The array has two arguments, the difficulty of the level, and the |
475 | * magical bonus "wanted". |
447 | * magical bonus "wanted". |
476 | */ |
448 | */ |
477 | |
449 | |
478 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
450 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
479 | |
|
|
480 | /*chance of magic difficulty*/ |
451 | // chance of magic difficulty |
481 | |
|
|
482 | /* +0 +1 +2 +3 +4 */ |
452 | // +0 +1 +2 +3 +4 |
483 | {95, 2, 2, 1, 0}, /*1 */ |
453 | {95, 2, 2, 1, 0}, // 1 |
484 | {92, 5, 2, 1, 0}, /*2 */ |
454 | {92, 5, 2, 1, 0}, // 2 |
485 | {85, 10, 4, 1, 0}, /*3 */ |
455 | {85, 10, 4, 1, 0}, // 3 |
486 | {80, 14, 4, 2, 0}, /*4 */ |
456 | {80, 14, 4, 2, 0}, // 4 |
487 | {75, 17, 5, 2, 1}, /*5 */ |
457 | {75, 17, 5, 2, 1}, // 5 |
488 | {70, 18, 8, 3, 1}, /*6 */ |
458 | {70, 18, 8, 3, 1}, // 6 |
489 | {65, 21, 10, 3, 1}, /*7 */ |
459 | {65, 21, 10, 3, 1}, // 7 |
490 | {60, 22, 12, 4, 2}, /*8 */ |
460 | {60, 22, 12, 4, 2}, // 8 |
491 | {55, 25, 14, 4, 2}, /*9 */ |
461 | {55, 25, 14, 4, 2}, // 9 |
492 | {50, 27, 16, 5, 2}, /*10 */ |
462 | {50, 27, 16, 5, 2}, // 10 |
493 | {45, 28, 18, 6, 3}, /*11 */ |
463 | {45, 28, 18, 6, 3}, // 11 |
494 | {42, 28, 20, 7, 3}, /*12 */ |
464 | {42, 28, 20, 7, 3}, // 12 |
495 | {40, 27, 21, 8, 4}, /*13 */ |
465 | {40, 27, 21, 8, 4}, // 13 |
496 | {38, 25, 22, 10, 5}, /*14 */ |
466 | {38, 25, 22, 10, 5}, // 14 |
497 | {36, 23, 23, 12, 6}, /*15 */ |
467 | {36, 23, 23, 12, 6}, // 15 |
498 | {33, 21, 24, 14, 8}, /*16 */ |
468 | {33, 21, 24, 14, 8}, // 16 |
499 | {31, 19, 25, 16, 9}, /*17 */ |
469 | {31, 19, 25, 16, 9}, // 17 |
500 | {27, 15, 30, 18, 10}, /*18 */ |
470 | {27, 15, 30, 18, 10}, // 18 |
501 | {20, 12, 30, 25, 13}, /*19 */ |
471 | {20, 12, 30, 25, 13}, // 19 |
502 | {15, 10, 28, 30, 17}, /*20 */ |
472 | {15, 10, 28, 30, 17}, // 20 |
503 | {13, 9, 27, 28, 23}, /*21 */ |
473 | {13, 9, 27, 28, 23}, // 21 |
504 | {10, 8, 25, 28, 29}, /*22 */ |
474 | {10, 8, 25, 28, 29}, // 22 |
505 | {8, 7, 23, 26, 36}, /*23 */ |
475 | { 8, 7, 23, 26, 36}, // 23 |
506 | {6, 6, 20, 22, 46}, /*24 */ |
476 | { 6, 6, 20, 22, 46}, // 24 |
507 | {4, 5, 17, 18, 56}, /*25 */ |
477 | { 4, 5, 17, 18, 56}, // 25 |
508 | {2, 4, 12, 14, 68}, /*26 */ |
478 | { 2, 4, 12, 14, 68}, // 26 |
509 | {0, 3, 7, 10, 80}, /*27 */ |
479 | { 0, 3, 7, 10, 80}, // 27 |
510 | {0, 0, 3, 7, 90}, /*28 */ |
480 | { 0, 0, 3, 7, 90}, // 28 |
511 | {0, 0, 0, 3, 97}, /*29 */ |
481 | { 0, 0, 0, 3, 97}, // 29 |
512 | {0, 0, 0, 0, 100}, /*30 */ |
482 | { 0, 0, 0, 0, 100}, // 30 |
513 | {0, 0, 0, 0, 100}, /*31 */ |
483 | { 0, 0, 0, 0, 100}, // 31 |
514 | }; |
484 | }; |
515 | |
|
|
516 | |
485 | |
517 | /* calculate the appropriate level for wands staves and scrolls. |
486 | /* calculate the appropriate level for wands staves and scrolls. |
518 | * This code presumes that op has had its spell object created (in op->inv) |
487 | * This code presumes that op has had its spell object created (in op->inv) |
519 | * |
488 | * |
520 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
489 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
521 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
490 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
522 | */ |
491 | */ |
523 | |
|
|
524 | int |
492 | int |
525 | level_for_item (const object *op, int difficulty) |
493 | level_for_item (const object *op, int difficulty) |
526 | { |
494 | { |
527 | int olevel = 0; |
495 | int olevel = 0; |
528 | |
496 | |
… | |
… | |
551 | * elmex Thu Aug 10 18:45:44 CEST 2006: |
519 | * elmex Thu Aug 10 18:45:44 CEST 2006: |
552 | * Scaling difficulty by max_level, as difficulty is a level and not some |
520 | * Scaling difficulty by max_level, as difficulty is a level and not some |
553 | * weird integer between 1-31. |
521 | * weird integer between 1-31. |
554 | * |
522 | * |
555 | */ |
523 | */ |
556 | |
|
|
557 | int |
524 | int |
558 | magic_from_difficulty (int difficulty) |
525 | magic_from_difficulty (int difficulty) |
559 | { |
526 | { |
560 | int percent = 0, magic = 0; |
527 | int percent = 0, magic = 0; |
561 | int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); |
528 | int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); |
… | |
… | |
566 | scaled_diff = 0; |
533 | scaled_diff = 0; |
567 | |
534 | |
568 | if (scaled_diff >= DIFFLEVELS) |
535 | if (scaled_diff >= DIFFLEVELS) |
569 | scaled_diff = DIFFLEVELS - 1; |
536 | scaled_diff = DIFFLEVELS - 1; |
570 | |
537 | |
571 | percent = RANDOM () % 100; |
538 | percent = rndm (100); |
572 | |
539 | |
573 | for (magic = 0; magic < (MAXMAGIC + 1); magic++) |
540 | for (magic = 0; magic < (MAXMAGIC + 1); magic++) |
574 | { |
541 | { |
575 | percent -= difftomagic_list[scaled_diff][magic]; |
542 | percent -= difftomagic_list[scaled_diff][magic]; |
576 | |
543 | |
… | |
… | |
582 | { |
549 | { |
583 | LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); |
550 | LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); |
584 | magic = 0; |
551 | magic = 0; |
585 | } |
552 | } |
586 | |
553 | |
587 | magic = (RANDOM () % 3) ? magic : -magic; |
554 | magic = (rndm (3)) ? magic : -magic; |
588 | /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ |
555 | /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ |
589 | |
556 | |
590 | return magic; |
557 | return magic; |
591 | } |
558 | } |
592 | |
559 | |
… | |
… | |
607 | if (op->arch) |
574 | if (op->arch) |
608 | { |
575 | { |
609 | if (op->type == ARMOUR) |
576 | if (op->type == ARMOUR) |
610 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; |
577 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; |
611 | |
578 | |
612 | if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ |
579 | if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ |
613 | magic = (-magic); |
580 | magic = (-magic); |
614 | op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; |
581 | op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; |
615 | } |
582 | } |
616 | else |
583 | else |
617 | { |
584 | { |
618 | if (op->type == ARMOUR) |
585 | if (op->type == ARMOUR) |
619 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; |
586 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; |
620 | if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ |
587 | if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ |
621 | magic = (-magic); |
588 | magic = (-magic); |
622 | op->weight = (op->weight * (100 - magic * 10)) / 100; |
589 | op->weight = (op->weight * (100 - magic * 10)) / 100; |
623 | } |
590 | } |
624 | } |
591 | } |
625 | |
592 | |
… | |
… | |
649 | * 1) Since rings can have multiple bonuses, if the same bonus |
616 | * 1) Since rings can have multiple bonuses, if the same bonus |
650 | * is rolled again, increase it - the bonuses now stack with |
617 | * is rolled again, increase it - the bonuses now stack with |
651 | * other bonuses previously rolled and ones the item might natively have. |
618 | * other bonuses previously rolled and ones the item might natively have. |
652 | * 2) Add code to deal with new PR method. |
619 | * 2) Add code to deal with new PR method. |
653 | */ |
620 | */ |
654 | |
|
|
655 | void |
621 | void |
656 | set_ring_bonus (object *op, int bonus) |
622 | set_ring_bonus (object *op, int bonus) |
657 | { |
623 | { |
658 | |
624 | |
659 | int r = RANDOM () % (bonus > 0 ? 25 : 11); |
625 | int r = rndm (bonus > 0 ? 25 : 11); |
660 | |
626 | |
661 | if (op->type == AMULET) |
627 | if (op->type == AMULET) |
662 | { |
628 | { |
663 | if (!(RANDOM () % 21)) |
629 | if (!(rndm (21))) |
664 | r = 20 + RANDOM () % 2; |
630 | r = 20 + rndm (2); |
665 | else |
631 | else |
666 | { |
632 | { |
667 | if (RANDOM () & 2) |
633 | if (rndm (2)) |
668 | r = 10; |
634 | r = 10; |
669 | else |
635 | else |
670 | r = 11 + RANDOM () % 9; |
636 | r = 11 + rndm (9); |
671 | } |
637 | } |
672 | } |
638 | } |
673 | |
639 | |
674 | switch (r) |
640 | switch (r) |
675 | { |
641 | { |
… | |
… | |
682 | case 2: |
648 | case 2: |
683 | case 3: |
649 | case 3: |
684 | case 4: |
650 | case 4: |
685 | case 5: |
651 | case 5: |
686 | case 6: |
652 | case 6: |
687 | set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); |
653 | op->stats.stat (r) += bonus; |
688 | break; |
654 | break; |
689 | |
655 | |
690 | case 7: |
656 | case 7: |
691 | op->stats.dam += bonus; |
657 | op->stats.dam += bonus; |
692 | break; |
658 | break; |
… | |
… | |
712 | case 16: |
678 | case 16: |
713 | case 17: |
679 | case 17: |
714 | case 18: |
680 | case 18: |
715 | case 19: |
681 | case 19: |
716 | { |
682 | { |
717 | int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; |
683 | int b = 5 + abs (bonus), val, resist = rndm (num_resist_table); |
718 | |
684 | |
719 | /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ |
685 | /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ |
720 | val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; |
686 | val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b); |
721 | |
687 | |
722 | /* Cursed items need to have higher negative values to equal out with |
688 | /* Cursed items need to have higher negative values to equal out with |
723 | * positive values for how protections work out. Put another |
689 | * positive values for how protections work out. Put another |
724 | * little random element in since that they don't always end up with |
690 | * little random element in since that they don't always end up with |
725 | * even values. |
691 | * even values. |
726 | */ |
692 | */ |
727 | if (bonus < 0) |
693 | if (bonus < 0) |
728 | val = 2 * -val - RANDOM () % b; |
694 | val = 2 * -val - rndm (b); |
729 | if (val > 35) |
695 | if (val > 35) |
730 | val = 35; /* Upper limit */ |
696 | val = 35; /* Upper limit */ |
731 | b = 0; |
697 | b = 0; |
|
|
698 | |
732 | while (op->resist[resist_table[resist]] != 0 && b < 4) |
699 | while (op->resist[resist_table[resist]] != 0 && b < 4) |
733 | { |
|
|
734 | resist = RANDOM () % num_resist_table; |
700 | resist = rndm (num_resist_table); |
735 | } |
701 | |
736 | if (b == 4) |
702 | if (b == 4) |
737 | return; /* Not able to find a free resistance */ |
703 | return; /* Not able to find a free resistance */ |
|
|
704 | |
738 | op->resist[resist_table[resist]] = val; |
705 | op->resist[resist_table[resist]] = val; |
739 | /* We should probably do something more clever here to adjust value |
706 | /* We should probably do something more clever here to adjust value |
740 | * based on how good a resistance we gave. |
707 | * based on how good a resistance we gave. |
741 | */ |
708 | */ |
742 | break; |
709 | break; |
… | |
… | |
770 | case 22: |
737 | case 22: |
771 | op->stats.exp += bonus; /* Speed! */ |
738 | op->stats.exp += bonus; /* Speed! */ |
772 | op->value = (op->value * 2) / 3; |
739 | op->value = (op->value * 2) / 3; |
773 | break; |
740 | break; |
774 | } |
741 | } |
|
|
742 | |
775 | if (bonus > 0) |
743 | if (bonus > 0) |
776 | op->value *= 2 * bonus; |
744 | op->value *= 2 * bonus; |
777 | else |
745 | else |
778 | op->value = -(op->value * 2 * bonus) / 3; |
746 | op->value = -(op->value * 2 * bonus) / 3; |
779 | } |
747 | } |
… | |
… | |
784 | * higher is the chance of returning a low number. |
752 | * higher is the chance of returning a low number. |
785 | * It is only used in fix_generated_treasure() to set bonuses on |
753 | * It is only used in fix_generated_treasure() to set bonuses on |
786 | * rings and amulets. |
754 | * rings and amulets. |
787 | * Another scheme is used to calculate the magic of weapons and armours. |
755 | * Another scheme is used to calculate the magic of weapons and armours. |
788 | */ |
756 | */ |
789 | |
|
|
790 | int |
757 | int |
791 | get_magic (int diff) |
758 | get_magic (int diff) |
792 | { |
759 | { |
793 | int i; |
760 | int i; |
794 | |
761 | |
795 | if (diff < 3) |
762 | if (diff < 3) |
796 | diff = 3; |
763 | diff = 3; |
|
|
764 | |
797 | for (i = 0; i < 4; i++) |
765 | for (i = 0; i < 4; i++) |
798 | if (RANDOM () % diff) |
766 | if (rndm (diff)) |
799 | return i; |
767 | return i; |
|
|
768 | |
800 | return 4; |
769 | return 4; |
801 | } |
770 | } |
802 | |
771 | |
803 | #define DICE2 (get_magic(2)==2?2:1) |
772 | #define DICE2 (get_magic(2)==2?2:1) |
804 | #define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) |
773 | #define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) |
805 | |
774 | |
806 | /* |
775 | /* |
807 | * fix_generated_item(): This is called after an item is generated, in |
776 | * fix_generated_item(): This is called after an item is generated, in |
808 | * order to set it up right. This produced magical bonuses, puts spells |
777 | * order to set it up right. This produced magical bonuses, puts spells |
809 | * into scrolls/books/wands, makes it unidentified, hides the value, etc. |
778 | * into scrolls/books/wands, makes it unidentified, hides the value, etc. |
… | |
… | |
823 | * value. |
792 | * value. |
824 | * GT_MINIMAL: Does minimal processing on the object - just enough to make it |
793 | * GT_MINIMAL: Does minimal processing on the object - just enough to make it |
825 | * a working object - don't change magic, value, etc, but set it material |
794 | * a working object - don't change magic, value, etc, but set it material |
826 | * type as appropriate, for objects that need spell objects, set those, etc |
795 | * type as appropriate, for objects that need spell objects, set those, etc |
827 | */ |
796 | */ |
828 | |
|
|
829 | void |
797 | void |
830 | fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) |
798 | fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) |
831 | { |
799 | { |
832 | int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; |
800 | int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; |
833 | |
801 | |
… | |
… | |
838 | save_item_power = op->item_power; |
806 | save_item_power = op->item_power; |
839 | op->item_power = 0; |
807 | op->item_power = 0; |
840 | |
808 | |
841 | if (op->randomitems && op->type != SPELL) |
809 | if (op->randomitems && op->type != SPELL) |
842 | { |
810 | { |
843 | create_treasure (op->randomitems, op, flags, difficulty, 0); |
811 | create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0); |
844 | if (!op->inv) |
|
|
845 | LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name); |
|
|
846 | |
|
|
847 | /* So the treasure doesn't get created again */ |
812 | /* So the treasure doesn't get created again */ |
848 | op->randomitems = NULL; |
813 | op->randomitems = 0; |
849 | } |
814 | } |
850 | |
815 | |
851 | if (difficulty < 1) |
816 | if (difficulty < 1) |
852 | difficulty = 1; |
817 | difficulty = 1; |
|
|
818 | |
|
|
819 | if (INVOKE_OBJECT (ADD_BONUS, op, |
|
|
820 | ARG_OBJECT (creator != op ? creator : 0), |
|
|
821 | ARG_INT (difficulty), ARG_INT (max_magic), |
|
|
822 | ARG_INT (flags))) |
|
|
823 | return; |
853 | |
824 | |
854 | if (!(flags & GT_MINIMAL)) |
825 | if (!(flags & GT_MINIMAL)) |
855 | { |
826 | { |
856 | if (op->arch == crown_arch) |
827 | if (op->arch == crown_arch) |
857 | { |
828 | { |
… | |
… | |
864 | if (!op->magic && max_magic) |
835 | if (!op->magic && max_magic) |
865 | set_magic (difficulty, op, max_magic, flags); |
836 | set_magic (difficulty, op, max_magic, flags); |
866 | |
837 | |
867 | num_enchantments = calc_item_power (op, 1); |
838 | num_enchantments = calc_item_power (op, 1); |
868 | |
839 | |
869 | if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, |
840 | if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) |
|
|
841 | || op->type == HORN |
|
|
842 | || difficulty >= settings.max_level) /* high difficulties always generate an artifact, |
870 | * used for shop_floors or treasures */ |
843 | * used for shop_floors or treasures */ |
871 | generate_artifact (op, difficulty); |
844 | generate_artifact (op, difficulty); |
872 | } |
845 | } |
873 | |
846 | |
874 | /* Object was made an artifact. Calculate its item_power rating. |
847 | /* Object was made an artifact. Calculate its item_power rating. |
… | |
… | |
932 | case WEAPON: |
905 | case WEAPON: |
933 | case ARMOUR: |
906 | case ARMOUR: |
934 | case SHIELD: |
907 | case SHIELD: |
935 | case HELMET: |
908 | case HELMET: |
936 | case CLOAK: |
909 | case CLOAK: |
937 | if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) |
910 | if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) |
938 | set_ring_bonus (op, -DICE2); |
911 | set_ring_bonus (op, -DICE2); |
939 | break; |
912 | break; |
940 | |
913 | |
941 | case BRACERS: |
914 | case BRACERS: |
942 | if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) |
915 | if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)) |
943 | { |
916 | { |
944 | set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); |
917 | set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); |
945 | if (!QUERY_FLAG (op, FLAG_CURSED)) |
918 | if (!QUERY_FLAG (op, FLAG_CURSED)) |
946 | op->value *= 3; |
919 | op->value *= 3; |
947 | } |
920 | } |
… | |
… | |
973 | */ |
946 | */ |
974 | if (op->inv && op->randomitems) |
947 | if (op->inv && op->randomitems) |
975 | { |
948 | { |
976 | /* value multiplier is same as for scrolls */ |
949 | /* value multiplier is same as for scrolls */ |
977 | op->value = (op->value * op->inv->value); |
950 | op->value = (op->value * op->inv->value); |
978 | op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; |
951 | op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); |
979 | } |
952 | } |
980 | else |
953 | else |
981 | { |
954 | { |
982 | op->name = "potion"; |
955 | op->name = "potion"; |
983 | op->name_pl = "potions"; |
956 | op->name_pl = "potions"; |
984 | } |
957 | } |
985 | |
958 | |
986 | if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) |
959 | if (!(flags & GT_ONLY_GOOD) && rndm (2)) |
987 | SET_FLAG (op, FLAG_CURSED); |
960 | SET_FLAG (op, FLAG_CURSED); |
988 | break; |
961 | break; |
989 | } |
962 | } |
990 | |
963 | |
991 | case AMULET: |
964 | case AMULET: |
… | |
… | |
993 | op->value *= 5; /* Since it's not just decoration */ |
966 | op->value *= 5; /* Since it's not just decoration */ |
994 | |
967 | |
995 | case RING: |
968 | case RING: |
996 | if (op->arch == NULL) |
969 | if (op->arch == NULL) |
997 | { |
970 | { |
998 | remove_ob (op); |
971 | op->destroy (); |
999 | free_object (op); |
|
|
1000 | op = NULL; |
972 | op = 0; |
1001 | break; |
973 | break; |
1002 | } |
974 | } |
1003 | |
975 | |
1004 | if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ |
976 | if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ |
1005 | break; |
977 | break; |
1006 | |
978 | |
1007 | if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) |
979 | if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) |
1008 | SET_FLAG (op, FLAG_CURSED); |
980 | SET_FLAG (op, FLAG_CURSED); |
1009 | |
981 | |
1010 | set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); |
982 | set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); |
1011 | |
983 | |
1012 | if (op->type != RING) /* Amulets have only one ability */ |
984 | if (op->type != RING) /* Amulets have only one ability */ |
1013 | break; |
985 | break; |
1014 | |
986 | |
1015 | if (!(RANDOM () % 4)) |
987 | if (!(rndm (4))) |
1016 | { |
988 | { |
1017 | int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; |
989 | int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; |
1018 | |
990 | |
1019 | if (d > 0) |
991 | if (d > 0) |
1020 | op->value *= 3; |
992 | op->value *= 3; |
1021 | |
993 | |
1022 | set_ring_bonus (op, d); |
994 | set_ring_bonus (op, d); |
1023 | |
995 | |
1024 | if (!(RANDOM () % 4)) |
996 | if (!(rndm (4))) |
1025 | { |
997 | { |
1026 | int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; |
998 | int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; |
1027 | |
999 | |
1028 | if (d > 0) |
1000 | if (d > 0) |
1029 | op->value *= 5; |
1001 | op->value *= 5; |
1030 | set_ring_bonus (op, d); |
1002 | set_ring_bonus (op, d); |
1031 | } |
1003 | } |
1032 | } |
1004 | } |
1033 | |
1005 | |
1034 | if (GET_ANIM_ID (op)) |
1006 | if (GET_ANIM_ID (op)) |
1035 | SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); |
1007 | SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); |
1036 | |
1008 | |
1037 | break; |
1009 | break; |
1038 | |
1010 | |
1039 | case BOOK: |
1011 | case BOOK: |
1040 | /* Is it an empty book?, if yes lets make a special· |
1012 | /* Is it an empty book?, if yes lets make a special· |
1041 | * msg for it, and tailor its properties based on the· |
1013 | * msg for it, and tailor its properties based on the· |
1042 | * creator and/or map level we found it on. |
1014 | * creator and/or map level we found it on. |
1043 | */ |
1015 | */ |
1044 | if (!op->msg && RANDOM () % 10) |
1016 | if (!op->msg && rndm (10)) |
1045 | { |
1017 | { |
1046 | /* set the book level properly */ |
1018 | /* set the book level properly */ |
1047 | if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) |
1019 | if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) |
1048 | { |
1020 | { |
1049 | if (op->map && op->map->difficulty) |
1021 | if (op->map && op->map->difficulty) |
1050 | op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; |
1022 | op->level = rndm (op->map->difficulty) + rndm (10) + 1; |
1051 | else |
1023 | else |
1052 | op->level = RANDOM () % 20 + 1; |
1024 | op->level = rndm (20) + 1; |
1053 | } |
1025 | } |
1054 | else |
1026 | else |
1055 | op->level = RANDOM () % creator->level; |
1027 | op->level = rndm (creator->level); |
1056 | |
1028 | |
1057 | tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); |
1029 | tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); |
1058 | /* books w/ info are worth more! */ |
1030 | /* books w/ info are worth more! */ |
1059 | op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); |
1031 | op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); |
1060 | /* creator related stuff */ |
1032 | /* creator related stuff */ |
… | |
… | |
1159 | */ |
1131 | */ |
1160 | |
1132 | |
1161 | /* |
1133 | /* |
1162 | * Allocate and return the pointer to an empty artifactlist structure. |
1134 | * Allocate and return the pointer to an empty artifactlist structure. |
1163 | */ |
1135 | */ |
1164 | |
|
|
1165 | static artifactlist * |
1136 | static artifactlist * |
1166 | get_empty_artifactlist (void) |
1137 | get_empty_artifactlist (void) |
1167 | { |
1138 | { |
1168 | artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist)); |
1139 | return salloc0 <artifactlist> (); |
1169 | |
|
|
1170 | if (tl == NULL) |
|
|
1171 | fatal (OUT_OF_MEMORY); |
|
|
1172 | tl->next = NULL; |
|
|
1173 | tl->items = NULL; |
|
|
1174 | tl->total_chance = 0; |
|
|
1175 | return tl; |
|
|
1176 | } |
1140 | } |
1177 | |
1141 | |
1178 | /* |
1142 | /* |
1179 | * Allocate and return the pointer to an empty artifact structure. |
1143 | * Allocate and return the pointer to an empty artifact structure. |
1180 | */ |
1144 | */ |
1181 | |
|
|
1182 | static artifact * |
1145 | static artifact * |
1183 | get_empty_artifact (void) |
1146 | get_empty_artifact (void) |
1184 | { |
1147 | { |
1185 | artifact *t = (artifact *) malloc (sizeof (artifact)); |
1148 | return salloc0 <artifact> (); |
1186 | |
|
|
1187 | if (t == NULL) |
|
|
1188 | fatal (OUT_OF_MEMORY); |
|
|
1189 | t->item = NULL; |
|
|
1190 | t->next = NULL; |
|
|
1191 | t->chance = 0; |
|
|
1192 | t->difficulty = 0; |
|
|
1193 | t->allowed = NULL; |
|
|
1194 | return t; |
|
|
1195 | } |
1149 | } |
1196 | |
1150 | |
1197 | /* |
1151 | /* |
1198 | * Searches the artifact lists and returns one that has the same type |
1152 | * Searches the artifact lists and returns one that has the same type |
1199 | * of objects on it. |
1153 | * of objects on it. |
1200 | */ |
1154 | */ |
1201 | |
|
|
1202 | artifactlist * |
1155 | artifactlist * |
1203 | find_artifactlist (int type) |
1156 | find_artifactlist (int type) |
1204 | { |
1157 | { |
1205 | artifactlist *al; |
|
|
1206 | |
|
|
1207 | for (al = first_artifactlist; al != NULL; al = al->next) |
1158 | for (artifactlist *al = first_artifactlist; al; al = al->next) |
1208 | if (al->type == type) |
1159 | if (al->type == type) |
1209 | return al; |
1160 | return al; |
|
|
1161 | |
1210 | return NULL; |
1162 | return 0; |
1211 | } |
1163 | } |
1212 | |
1164 | |
1213 | /* |
1165 | /* |
1214 | * For debugging purposes. Dumps all tables. |
1166 | * For debugging purposes. Dumps all tables. |
1215 | */ |
1167 | */ |
1216 | |
|
|
1217 | void |
1168 | void |
1218 | dump_artifacts (void) |
1169 | dump_artifacts (void) |
1219 | { |
1170 | { |
1220 | artifactlist *al; |
1171 | artifactlist *al; |
1221 | artifact *art; |
1172 | artifact *art; |
… | |
… | |
1228 | for (art = al->items; art != NULL; art = art->next) |
1179 | for (art = al->items; art != NULL; art = art->next) |
1229 | { |
1180 | { |
1230 | fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); |
1181 | fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); |
1231 | if (art->allowed != NULL) |
1182 | if (art->allowed != NULL) |
1232 | { |
1183 | { |
1233 | fprintf (logfile, "\tAllowed combinations:"); |
1184 | fprintf (logfile, "\tallowed combinations:"); |
1234 | for (next = art->allowed; next != NULL; next = next->next) |
1185 | for (next = art->allowed; next != NULL; next = next->next) |
1235 | fprintf (logfile, "%s,", &next->name); |
1186 | fprintf (logfile, "%s,", &next->name); |
1236 | fprintf (logfile, "\n"); |
1187 | fprintf (logfile, "\n"); |
1237 | } |
1188 | } |
1238 | } |
1189 | } |
… | |
… | |
1249 | treasurelist *tl; |
1200 | treasurelist *tl; |
1250 | int i; |
1201 | int i; |
1251 | |
1202 | |
1252 | if (depth > 100) |
1203 | if (depth > 100) |
1253 | return; |
1204 | return; |
1254 | while (t != NULL) |
1205 | |
|
|
1206 | while (t) |
1255 | { |
1207 | { |
1256 | if (t->name != NULL) |
1208 | if (t->name) |
1257 | { |
1209 | { |
1258 | for (i = 0; i < depth; i++) |
1210 | for (i = 0; i < depth; i++) |
1259 | fprintf (logfile, " "); |
1211 | fprintf (logfile, " "); |
|
|
1212 | |
1260 | fprintf (logfile, "{ (list: %s)\n", &t->name); |
1213 | fprintf (logfile, "{ (list: %s)\n", &t->name); |
|
|
1214 | |
1261 | tl = find_treasurelist (t->name); |
1215 | tl = treasurelist::find (t->name); |
|
|
1216 | if (tl) |
1262 | dump_monster_treasure_rec (name, tl->items, depth + 2); |
1217 | dump_monster_treasure_rec (name, tl->items, depth + 2); |
|
|
1218 | |
1263 | for (i = 0; i < depth; i++) |
1219 | for (i = 0; i < depth; i++) |
1264 | fprintf (logfile, " "); |
1220 | fprintf (logfile, " "); |
|
|
1221 | |
1265 | fprintf (logfile, "} (end of list: %s)\n", &t->name); |
1222 | fprintf (logfile, "} (end of list: %s)\n", &t->name); |
1266 | } |
1223 | } |
1267 | else |
1224 | else |
1268 | { |
1225 | { |
1269 | for (i = 0; i < depth; i++) |
1226 | for (i = 0; i < depth; i++) |
1270 | fprintf (logfile, " "); |
1227 | fprintf (logfile, " "); |
|
|
1228 | |
1271 | if (t->item->clone.type == FLESH) |
1229 | if (t->item && t->item->clone.type == FLESH) |
1272 | fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); |
1230 | fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); |
1273 | else |
1231 | else |
1274 | fprintf (logfile, "%s\n", &t->item->clone.name); |
1232 | fprintf (logfile, "%s\n", &t->item->clone.name); |
1275 | } |
1233 | } |
|
|
1234 | |
1276 | if (t->next_yes != NULL) |
1235 | if (t->next_yes) |
1277 | { |
1236 | { |
1278 | for (i = 0; i < depth; i++) |
1237 | for (i = 0; i < depth; i++) |
1279 | fprintf (logfile, " "); |
1238 | fprintf (logfile, " "); |
|
|
1239 | |
1280 | fprintf (logfile, " (if yes)\n"); |
1240 | fprintf (logfile, " (if yes)\n"); |
1281 | dump_monster_treasure_rec (name, t->next_yes, depth + 1); |
1241 | dump_monster_treasure_rec (name, t->next_yes, depth + 1); |
1282 | } |
1242 | } |
|
|
1243 | |
1283 | if (t->next_no != NULL) |
1244 | if (t->next_no) |
1284 | { |
1245 | { |
1285 | for (i = 0; i < depth; i++) |
1246 | for (i = 0; i < depth; i++) |
1286 | fprintf (logfile, " "); |
1247 | fprintf (logfile, " "); |
|
|
1248 | |
1287 | fprintf (logfile, " (if no)\n"); |
1249 | fprintf (logfile, " (if no)\n"); |
1288 | dump_monster_treasure_rec (name, t->next_no, depth + 1); |
1250 | dump_monster_treasure_rec (name, t->next_no, depth + 1); |
1289 | } |
1251 | } |
|
|
1252 | |
1290 | t = t->next; |
1253 | t = t->next; |
1291 | } |
1254 | } |
1292 | } |
1255 | } |
1293 | |
1256 | |
1294 | /* |
1257 | /* |
1295 | * For debugging purposes. Dumps all treasures for a given monster. |
1258 | * For debugging purposes. Dumps all treasures for a given monster. |
1296 | * Created originally by Raphael Quinet for debugging the alchemy code. |
1259 | * Created originally by Raphael Quinet for debugging the alchemy code. |
1297 | */ |
1260 | */ |
1298 | |
|
|
1299 | void |
1261 | void |
1300 | dump_monster_treasure (const char *name) |
1262 | dump_monster_treasure (const char *name) |
1301 | { |
1263 | { |
1302 | archetype *at; |
1264 | archetype *at; |
1303 | int found; |
1265 | int found; |
1304 | |
1266 | |
1305 | found = 0; |
1267 | found = 0; |
1306 | fprintf (logfile, "\n"); |
1268 | fprintf (logfile, "\n"); |
|
|
1269 | |
1307 | for (at = first_archetype; at != NULL; at = at->next) |
1270 | for (at = first_archetype; at != NULL; at = at->next) |
1308 | if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) |
1271 | if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) |
1309 | { |
1272 | { |
1310 | fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); |
1273 | fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); |
1311 | if (at->clone.randomitems != NULL) |
1274 | if (at->clone.randomitems != NULL) |
1312 | dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); |
1275 | dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); |
1313 | else |
1276 | else |
1314 | fprintf (logfile, "(nothing)\n"); |
1277 | fprintf (logfile, "(nothing)\n"); |
|
|
1278 | |
1315 | fprintf (logfile, "\n"); |
1279 | fprintf (logfile, "\n"); |
1316 | found++; |
1280 | found++; |
1317 | } |
1281 | } |
|
|
1282 | |
1318 | if (found == 0) |
1283 | if (found == 0) |
1319 | fprintf (logfile, "No objects have the name %s!\n\n", name); |
1284 | fprintf (logfile, "No objects have the name %s!\n\n", name); |
1320 | } |
1285 | } |
1321 | |
1286 | |
1322 | /* |
1287 | /* |
1323 | * Builds up the lists of artifacts from the file in the libdir. |
1288 | * Builds up the lists of artifacts from the file in the libdir. |
1324 | */ |
1289 | */ |
1325 | |
|
|
1326 | void |
1290 | void |
1327 | init_artifacts (void) |
1291 | init_artifacts (void) |
1328 | { |
1292 | { |
1329 | static int has_been_inited = 0; |
1293 | static int has_been_inited = 0; |
1330 | char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; |
1294 | char filename[MAX_BUF]; |
1331 | artifact *art = NULL; |
1295 | artifact *art = NULL; |
1332 | linked_char *tmp; |
|
|
1333 | int value; |
|
|
1334 | artifactlist *al; |
1296 | artifactlist *al; |
1335 | |
1297 | |
1336 | if (has_been_inited) |
1298 | if (has_been_inited) |
1337 | return; |
1299 | return; |
1338 | else |
1300 | else |
1339 | has_been_inited = 1; |
1301 | has_been_inited = 1; |
1340 | |
1302 | |
1341 | sprintf (filename, "%s/artifacts", settings.datadir); |
1303 | sprintf (filename, "%s/artifacts", settings.datadir); |
1342 | object_thawer thawer (filename); |
1304 | object_thawer f (filename); |
1343 | |
1305 | |
1344 | if (!thawer) |
1306 | if (!f) |
1345 | return; |
1307 | return; |
1346 | |
1308 | |
1347 | while (fgets (buf, HUGE_BUF, thawer) != NULL) |
1309 | f.next (); |
1348 | { |
|
|
1349 | if (*buf == '#') |
|
|
1350 | continue; |
|
|
1351 | if ((cp = strchr (buf, '\n')) != NULL) |
|
|
1352 | *cp = '\0'; |
|
|
1353 | cp = buf; |
|
|
1354 | while (*cp == ' ') /* Skip blanks */ |
|
|
1355 | cp++; |
|
|
1356 | if (*cp == '\0') |
|
|
1357 | continue; |
|
|
1358 | |
1310 | |
1359 | if (!strncmp (cp, "Allowed", 7)) |
1311 | for (;;) |
|
|
1312 | { |
|
|
1313 | switch (f.kw) |
1360 | { |
1314 | { |
|
|
1315 | case KW_allowed: |
1361 | if (art == NULL) |
1316 | if (!art) |
|
|
1317 | art = get_empty_artifact (); |
|
|
1318 | |
1362 | { |
1319 | { |
1363 | art = get_empty_artifact (); |
1320 | if (!strcmp (f.get_str (), "all")) |
1364 | nrofartifacts++; |
1321 | break; |
|
|
1322 | |
|
|
1323 | char *next, *cp = f.get_str (); |
|
|
1324 | |
|
|
1325 | do |
|
|
1326 | { |
|
|
1327 | if ((next = strchr (cp, ','))) |
|
|
1328 | *next++ = '\0'; |
|
|
1329 | |
|
|
1330 | linked_char *tmp = new linked_char; |
|
|
1331 | |
|
|
1332 | tmp->name = cp; |
|
|
1333 | tmp->next = art->allowed; |
|
|
1334 | art->allowed = tmp; |
|
|
1335 | } |
|
|
1336 | while ((cp = next)); |
1365 | } |
1337 | } |
1366 | cp = strchr (cp, ' ') + 1; |
1338 | break; |
1367 | if (!strcmp (cp, "all")) |
1339 | |
|
|
1340 | case KW_chance: |
|
|
1341 | f.get (art->chance); |
|
|
1342 | break; |
|
|
1343 | |
|
|
1344 | case KW_difficulty: |
|
|
1345 | f.get (art->difficulty); |
|
|
1346 | break; |
|
|
1347 | |
|
|
1348 | case KW_object: |
|
|
1349 | { |
|
|
1350 | art->item = object::create (); |
|
|
1351 | f.get (art->item->name); |
|
|
1352 | f.next (); |
|
|
1353 | |
|
|
1354 | if (!art->item->parse_kv (f)) |
|
|
1355 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
|
|
1356 | |
|
|
1357 | al = find_artifactlist (art->item->type); |
|
|
1358 | |
|
|
1359 | if (!al) |
|
|
1360 | { |
|
|
1361 | al = get_empty_artifactlist (); |
|
|
1362 | al->type = art->item->type; |
|
|
1363 | al->next = first_artifactlist; |
|
|
1364 | first_artifactlist = al; |
|
|
1365 | } |
|
|
1366 | |
|
|
1367 | art->next = al->items; |
|
|
1368 | al->items = art; |
|
|
1369 | art = 0; |
|
|
1370 | } |
1368 | continue; |
1371 | continue; |
1369 | |
1372 | |
1370 | do |
1373 | case KW_EOF: |
|
|
1374 | goto done; |
|
|
1375 | |
|
|
1376 | default: |
|
|
1377 | if (!f.parse_error ("artifacts file")) |
|
|
1378 | cleanup ("artifacts file required"); |
1371 | { |
1379 | break; |
1372 | nrofallowedstr++; |
|
|
1373 | if ((next = strchr (cp, ',')) != NULL) |
|
|
1374 | *(next++) = '\0'; |
|
|
1375 | tmp = new linked_char; |
|
|
1376 | |
|
|
1377 | tmp->name = cp; |
|
|
1378 | tmp->next = art->allowed; |
|
|
1379 | art->allowed = tmp; |
|
|
1380 | } |
|
|
1381 | while ((cp = next) != NULL); |
|
|
1382 | } |
|
|
1383 | else if (sscanf (cp, "chance %d", &value)) |
|
|
1384 | art->chance = (uint16) value; |
|
|
1385 | else if (sscanf (cp, "difficulty %d", &value)) |
|
|
1386 | art->difficulty = (uint8) value; |
|
|
1387 | else if (!strncmp (cp, "Object", 6)) |
|
|
1388 | { |
1380 | } |
1389 | art->item = get_object (); |
|
|
1390 | |
1381 | |
1391 | if (!load_object (thawer, art->item, 0)) |
1382 | f.next (); |
1392 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
|
|
1393 | |
|
|
1394 | art->item->name = strchr (cp, ' ') + 1; |
|
|
1395 | al = find_artifactlist (art->item->type); |
|
|
1396 | if (al == NULL) |
|
|
1397 | { |
|
|
1398 | al = get_empty_artifactlist (); |
|
|
1399 | al->type = art->item->type; |
|
|
1400 | al->next = first_artifactlist; |
|
|
1401 | first_artifactlist = al; |
|
|
1402 | } |
|
|
1403 | art->next = al->items; |
|
|
1404 | al->items = art; |
|
|
1405 | art = NULL; |
|
|
1406 | } |
|
|
1407 | else |
|
|
1408 | LOG (llevError, "Unknown input in artifact file: %s\n", buf); |
|
|
1409 | } |
1383 | } |
1410 | |
1384 | |
|
|
1385 | done: |
1411 | for (al = first_artifactlist; al != NULL; al = al->next) |
1386 | for (al = first_artifactlist; al; al = al->next) |
1412 | { |
1387 | { |
|
|
1388 | al->total_chance = 0; |
|
|
1389 | |
1413 | for (art = al->items; art != NULL; art = art->next) |
1390 | for (art = al->items; art; art = art->next) |
1414 | { |
1391 | { |
1415 | if (!art->chance) |
1392 | if (!art->chance) |
1416 | LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); |
1393 | LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); |
1417 | else |
1394 | else |
1418 | al->total_chance += art->chance; |
1395 | al->total_chance += art->chance; |
… | |
… | |
1423 | } |
1400 | } |
1424 | |
1401 | |
1425 | LOG (llevDebug, "done.\n"); |
1402 | LOG (llevDebug, "done.\n"); |
1426 | } |
1403 | } |
1427 | |
1404 | |
1428 | |
|
|
1429 | /* |
1405 | /* |
1430 | * Used in artifact generation. The bonuses of the first object |
1406 | * Used in artifact generation. The bonuses of the first object |
1431 | * is modified by the bonuses of the second object. |
1407 | * is modified by the bonuses of the second object. |
1432 | */ |
1408 | */ |
1433 | |
|
|
1434 | void |
1409 | void |
1435 | add_abilities (object *op, object *change) |
1410 | add_abilities (object *op, object *change) |
1436 | { |
1411 | { |
1437 | int i, tmp; |
1412 | int i, tmp; |
1438 | |
1413 | |
1439 | if (change->face != blank_face) |
1414 | if (change->face != blank_face) |
1440 | { |
1415 | { |
1441 | #ifdef TREASURE_VERBOSE |
1416 | #ifdef TREASURE_VERBOSE |
1442 | LOG (llevDebug, "FACE: %d\n", change->face->number); |
1417 | LOG (llevDebug, "add_abilities change face: %d\n", change->face); |
1443 | #endif |
1418 | #endif |
1444 | op->face = change->face; |
1419 | op->face = change->face; |
1445 | } |
1420 | } |
1446 | |
1421 | |
1447 | for (i = 0; i < NUM_STATS; i++) |
1422 | for (i = 0; i < NUM_STATS; i++) |
1448 | change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); |
1423 | change_attr_value (&(op->stats), i, change->stats.stat (i)); |
1449 | |
1424 | |
1450 | op->attacktype |= change->attacktype; |
1425 | op->attacktype |= change->attacktype; |
1451 | op->path_attuned |= change->path_attuned; |
1426 | op->path_attuned |= change->path_attuned; |
1452 | op->path_repelled |= change->path_repelled; |
1427 | op->path_repelled |= change->path_repelled; |
1453 | op->path_denied |= change->path_denied; |
1428 | op->path_denied |= change->path_denied; |
… | |
… | |
1483 | CLEAR_FLAG (op, FLAG_ANIMATE); |
1458 | CLEAR_FLAG (op, FLAG_ANIMATE); |
1484 | /* so artifacts will join */ |
1459 | /* so artifacts will join */ |
1485 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1460 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1486 | op->speed = 0.0; |
1461 | op->speed = 0.0; |
1487 | |
1462 | |
1488 | update_ob_speed (op); |
1463 | op->set_speed (op->speed); |
1489 | } |
1464 | } |
1490 | |
1465 | |
1491 | if (change->nrof) |
1466 | if (change->nrof) |
1492 | op->nrof = RANDOM () % ((int) change->nrof) + 1; |
1467 | op->nrof = rndm (change->nrof) + 1; |
1493 | |
1468 | |
1494 | op->stats.exp += change->stats.exp; /* Speed modifier */ |
1469 | op->stats.exp += change->stats.exp; /* Speed modifier */ |
1495 | op->stats.wc += change->stats.wc; |
1470 | op->stats.wc += change->stats.wc; |
1496 | op->stats.ac += change->stats.ac; |
1471 | op->stats.ac += change->stats.ac; |
1497 | |
1472 | |
… | |
… | |
1505 | { |
1480 | { |
1506 | object *tmp_obj; |
1481 | object *tmp_obj; |
1507 | |
1482 | |
1508 | /* Remove any spells this object currently has in it */ |
1483 | /* Remove any spells this object currently has in it */ |
1509 | while (op->inv) |
1484 | while (op->inv) |
1510 | { |
1485 | op->inv->destroy (); |
1511 | tmp_obj = op->inv; |
|
|
1512 | remove_ob (tmp_obj); |
|
|
1513 | free_object (tmp_obj); |
|
|
1514 | } |
|
|
1515 | |
1486 | |
1516 | tmp_obj = arch_to_object (change->other_arch); |
1487 | tmp_obj = arch_to_object (change->other_arch); |
1517 | insert_ob_in_ob (tmp_obj, op); |
1488 | insert_ob_in_ob (tmp_obj, op); |
1518 | } |
1489 | } |
1519 | /* No harm setting this for potions/horns */ |
1490 | /* No harm setting this for potions/horns */ |
… | |
… | |
1556 | op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; |
1527 | op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; |
1557 | |
1528 | |
1558 | op->item_power = change->item_power; |
1529 | op->item_power = change->item_power; |
1559 | |
1530 | |
1560 | for (i = 0; i < NROFATTACKS; i++) |
1531 | for (i = 0; i < NROFATTACKS; i++) |
1561 | { |
|
|
1562 | if (change->resist[i]) |
1532 | if (change->resist[i]) |
1563 | { |
|
|
1564 | op->resist[i] += change->resist[i]; |
1533 | op->resist[i] += change->resist[i]; |
1565 | } |
|
|
1566 | } |
|
|
1567 | |
1534 | |
1568 | if (change->stats.dam) |
1535 | if (change->stats.dam) |
1569 | { |
1536 | { |
1570 | if (change->stats.dam < 0) |
1537 | if (change->stats.dam < 0) |
1571 | op->stats.dam = (-change->stats.dam); |
1538 | op->stats.dam = (-change->stats.dam); |
… | |
… | |
1608 | op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); |
1575 | op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); |
1609 | } |
1576 | } |
1610 | |
1577 | |
1611 | op->value *= change->value; |
1578 | op->value *= change->value; |
1612 | |
1579 | |
1613 | if (change->material) |
1580 | if (change->materials) |
1614 | op->material = change->material; |
1581 | op->materials = change->materials; |
1615 | |
1582 | |
1616 | if (change->materialname) |
1583 | if (change->materialname) |
1617 | op->materialname = change->materialname; |
1584 | op->materialname = change->materialname; |
1618 | |
1585 | |
1619 | if (change->slaying) |
1586 | if (change->slaying) |
… | |
… | |
1625 | if (change->msg) |
1592 | if (change->msg) |
1626 | op->msg = change->msg; |
1593 | op->msg = change->msg; |
1627 | } |
1594 | } |
1628 | |
1595 | |
1629 | static int |
1596 | static int |
1630 | legal_artifact_combination (object *op, artifact * art) |
1597 | legal_artifact_combination (object *op, artifact *art) |
1631 | { |
1598 | { |
1632 | int neg, success = 0; |
1599 | int neg, success = 0; |
1633 | linked_char *tmp; |
1600 | linked_char *tmp; |
1634 | const char *name; |
1601 | const char *name; |
1635 | |
1602 | |
1636 | if (art->allowed == (linked_char *) NULL) |
1603 | if (!art->allowed) |
1637 | return 1; /* Ie, "all" */ |
1604 | return 1; /* Ie, "all" */ |
|
|
1605 | |
1638 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1606 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1639 | { |
1607 | { |
1640 | #ifdef TREASURE_VERBOSE |
1608 | #ifdef TREASURE_VERBOSE |
1641 | LOG (llevDebug, "legal_art: %s\n", tmp->name); |
1609 | LOG (llevDebug, "legal_art: %s\n", &tmp->name); |
1642 | #endif |
1610 | #endif |
1643 | if (*tmp->name == '!') |
1611 | if (*tmp->name == '!') |
1644 | name = tmp->name + 1, neg = 1; |
1612 | name = tmp->name + 1, neg = 1; |
1645 | else |
1613 | else |
1646 | name = tmp->name, neg = 0; |
1614 | name = tmp->name, neg = 0; |
… | |
… | |
1653 | * everything is allowed except what we match |
1621 | * everything is allowed except what we match |
1654 | */ |
1622 | */ |
1655 | else if (neg) |
1623 | else if (neg) |
1656 | success = 1; |
1624 | success = 1; |
1657 | } |
1625 | } |
|
|
1626 | |
1658 | return success; |
1627 | return success; |
1659 | } |
1628 | } |
1660 | |
1629 | |
1661 | /* |
1630 | /* |
1662 | * Fixes the given object, giving it the abilities and titles |
1631 | * Fixes the given object, giving it the abilities and titles |
… | |
… | |
1713 | return; |
1682 | return; |
1714 | } |
1683 | } |
1715 | |
1684 | |
1716 | for (i = 0; i < ARTIFACT_TRIES; i++) |
1685 | for (i = 0; i < ARTIFACT_TRIES; i++) |
1717 | { |
1686 | { |
1718 | int roll = RANDOM () % al->total_chance; |
1687 | int roll = rndm (al->total_chance); |
1719 | |
1688 | |
1720 | for (art = al->items; art != NULL; art = art->next) |
1689 | for (art = al->items; art; art = art->next) |
1721 | { |
1690 | { |
1722 | roll -= art->chance; |
1691 | roll -= art->chance; |
1723 | if (roll < 0) |
1692 | if (roll < 0) |
1724 | break; |
1693 | break; |
1725 | } |
1694 | } |
… | |
… | |
1741 | continue; |
1710 | continue; |
1742 | |
1711 | |
1743 | if (!legal_artifact_combination (op, art)) |
1712 | if (!legal_artifact_combination (op, art)) |
1744 | { |
1713 | { |
1745 | #ifdef TREASURE_VERBOSE |
1714 | #ifdef TREASURE_VERBOSE |
1746 | LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); |
1715 | LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name); |
1747 | #endif |
1716 | #endif |
1748 | continue; |
1717 | continue; |
1749 | } |
1718 | } |
|
|
1719 | |
1750 | give_artifact_abilities (op, art->item); |
1720 | give_artifact_abilities (op, art->item); |
1751 | return; |
1721 | return; |
1752 | } |
1722 | } |
1753 | } |
1723 | } |
1754 | |
1724 | |
… | |
… | |
1798 | SET_FLAG (item, FLAG_NO_STEAL); |
1768 | SET_FLAG (item, FLAG_NO_STEAL); |
1799 | } |
1769 | } |
1800 | } |
1770 | } |
1801 | |
1771 | |
1802 | /* special_potion() - so that old potion code is still done right. */ |
1772 | /* special_potion() - so that old potion code is still done right. */ |
1803 | |
|
|
1804 | int |
1773 | int |
1805 | special_potion (object *op) |
1774 | special_potion (object *op) |
1806 | { |
1775 | { |
1807 | |
|
|
1808 | int i; |
|
|
1809 | |
|
|
1810 | if (op->attacktype) |
1776 | if (op->attacktype) |
1811 | return 1; |
1777 | return 1; |
1812 | |
1778 | |
1813 | if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha) |
1779 | if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha) |
1814 | return 1; |
1780 | return 1; |
1815 | |
1781 | |
1816 | for (i = 0; i < NROFATTACKS; i++) |
1782 | for (int i = 0; i < NROFATTACKS; i++) |
1817 | if (op->resist[i]) |
1783 | if (op->resist[i]) |
1818 | return 1; |
1784 | return 1; |
1819 | |
1785 | |
1820 | return 0; |
1786 | return 0; |
1821 | } |
1787 | } |
1822 | |
1788 | |
1823 | void |
1789 | void |
1824 | free_treasurestruct (treasure *t) |
1790 | free_treasurestruct (treasure *t) |
1825 | { |
1791 | { |
1826 | if (t->next) |
|
|
1827 | free_treasurestruct (t->next); |
1792 | if (t->next) free_treasurestruct (t->next); |
1828 | if (t->next_yes) |
|
|
1829 | free_treasurestruct (t->next_yes); |
1793 | if (t->next_yes) free_treasurestruct (t->next_yes); |
1830 | if (t->next_no) |
|
|
1831 | free_treasurestruct (t->next_no); |
1794 | if (t->next_no) free_treasurestruct (t->next_no); |
1832 | |
1795 | |
1833 | delete t; |
1796 | delete t; |
1834 | } |
1797 | } |
1835 | |
1798 | |
1836 | void |
1799 | void |
… | |
… | |
1841 | |
1804 | |
1842 | delete lc; |
1805 | delete lc; |
1843 | } |
1806 | } |
1844 | |
1807 | |
1845 | void |
1808 | void |
1846 | free_artifact (artifact * at) |
1809 | free_artifact (artifact *at) |
1847 | { |
1810 | { |
1848 | if (at->next) |
|
|
1849 | free_artifact (at->next); |
1811 | if (at->next) free_artifact (at->next); |
1850 | |
|
|
1851 | if (at->allowed) |
|
|
1852 | free_charlinks (at->allowed); |
1812 | if (at->allowed) free_charlinks (at->allowed); |
1853 | |
1813 | |
1854 | at->item->free (1); |
1814 | at->item->destroy (1); |
1855 | |
1815 | |
1856 | delete at; |
1816 | sfree (at); |
1857 | } |
1817 | } |
1858 | |
1818 | |
1859 | void |
1819 | void |
1860 | free_artifactlist (artifactlist * al) |
1820 | free_artifactlist (artifactlist *al) |
1861 | { |
1821 | { |
1862 | artifactlist *nextal; |
1822 | artifactlist *nextal; |
1863 | |
1823 | |
1864 | for (al = first_artifactlist; al != NULL; al = nextal) |
1824 | for (al = first_artifactlist; al; al = nextal) |
1865 | { |
1825 | { |
1866 | nextal = al->next; |
1826 | nextal = al->next; |
1867 | |
1827 | |
1868 | if (al->items) |
1828 | if (al->items) |
1869 | free_artifact (al->items); |
1829 | free_artifact (al->items); |
1870 | |
1830 | |
1871 | free (al); |
1831 | sfree (al); |
1872 | } |
1832 | } |
1873 | } |
1833 | } |
1874 | |
1834 | |
1875 | void |
1835 | void |
1876 | free_all_treasures (void) |
1836 | free_all_treasures (void) |
1877 | { |
1837 | { |
1878 | treasurelist *tl, *next; |
1838 | treasurelist *tl, *next; |
1879 | |
1839 | |
1880 | |
|
|
1881 | for (tl = first_treasurelist; tl != NULL; tl = next) |
1840 | for (tl = first_treasurelist; tl; tl = next) |
1882 | { |
1841 | { |
|
|
1842 | clear (tl); |
|
|
1843 | |
1883 | next = tl->next; |
1844 | next = tl->next; |
1884 | if (tl->items) |
|
|
1885 | free_treasurestruct (tl->items); |
|
|
1886 | delete tl; |
1845 | delete tl; |
1887 | } |
1846 | } |
|
|
1847 | |
1888 | free_artifactlist (first_artifactlist); |
1848 | free_artifactlist (first_artifactlist); |
1889 | } |
1849 | } |