… | |
… | |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | * |
21 | * |
22 | * 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> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | #define ALLOWED_COMBINATION |
|
|
26 | |
|
|
27 | /* TREASURE_DEBUG does some checking on the treasurelists after loading. |
25 | /* TREASURE_DEBUG does some checking on the treasurelists after loading. |
28 | * 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 |
29 | * 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 |
30 | * left on |
28 | * left on |
31 | */ |
29 | */ |
32 | #define TREASURE_DEBUG |
30 | #define TREASURE_DEBUG |
33 | |
31 | |
34 | /* TREASURE_VERBOSE enables copious output concerning artifact generation */ |
32 | /* TREASURE_VERBOSE enables copious output concerning artifact generation */ |
35 | |
33 | |
36 | /* #define TREASURE_VERBOSE */ |
34 | //#define TREASURE_VERBOSE |
37 | |
35 | |
38 | #include <global.h> |
36 | #include <global.h> |
39 | #include <treasure.h> |
37 | #include <treasure.h> |
40 | #include <funcpoint.h> |
38 | #include <funcpoint.h> |
41 | #include <loader.h> |
39 | #include <loader.h> |
42 | |
40 | |
|
|
41 | extern char *spell_mapping[]; |
|
|
42 | |
|
|
43 | static treasurelist *first_treasurelist; |
43 | |
44 | |
44 | static void change_treasure (treasure *t, object *op); /* overrule default values */ |
45 | static void change_treasure (treasure *t, object *op); /* overrule default values */ |
45 | extern char *spell_mapping[]; |
|
|
46 | |
46 | |
47 | /* |
47 | typedef std::tr1::unordered_map< |
48 | * Initialize global archtype pointers: |
48 | const char *, |
49 | */ |
49 | treasurelist *, |
|
|
50 | str_hash, |
|
|
51 | str_equal, |
|
|
52 | slice_allocator< std::pair<const char *const, treasurelist *> >, |
|
|
53 | true |
|
|
54 | > tl_map_t; |
50 | |
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 |
51 | void |
99 | void |
52 | init_archetype_pointers () |
100 | clear (treasurelist *tl) |
53 | { |
101 | { |
54 | int prev_warn = warn_archetypes; |
102 | if (tl->items) |
|
|
103 | { |
|
|
104 | free_treasurestruct (tl->items); |
|
|
105 | tl->items = 0; |
|
|
106 | } |
55 | |
107 | |
56 | warn_archetypes = 1; |
|
|
57 | if (ring_arch == NULL) |
|
|
58 | ring_arch = archetype::find ("ring"); |
|
|
59 | if (amulet_arch == NULL) |
|
|
60 | amulet_arch = archetype::find ("amulet"); |
|
|
61 | if (staff_arch == NULL) |
|
|
62 | staff_arch = archetype::find ("staff"); |
|
|
63 | if (crown_arch == NULL) |
|
|
64 | crown_arch = archetype::find ("crown"); |
|
|
65 | warn_archetypes = prev_warn; |
|
|
66 | } |
|
|
67 | |
|
|
68 | /* |
|
|
69 | * Allocate and return the pointer to an empty treasurelist structure. |
|
|
70 | */ |
|
|
71 | |
|
|
72 | static treasurelist * |
|
|
73 | get_empty_treasurelist (void) |
|
|
74 | { |
|
|
75 | return new treasurelist; |
|
|
76 | } |
|
|
77 | |
|
|
78 | /* |
|
|
79 | * Allocate and return the pointer to an empty treasure structure. |
|
|
80 | */ |
|
|
81 | //TODO: make this a constructor |
|
|
82 | static treasure * |
|
|
83 | get_empty_treasure (void) |
|
|
84 | { |
|
|
85 | treasure *t = new treasure; |
|
|
86 | |
|
|
87 | t->chance = 100; |
108 | tl->total_chance = 0; |
88 | |
|
|
89 | return t; |
|
|
90 | } |
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 |
91 | |
131 | |
92 | /* |
132 | /* |
93 | * Reads the lib/treasure file from disk, and parses the contents |
133 | * Reads the lib/treasure file from disk, and parses the contents |
94 | * into an internal treasure structure (very linked lists) |
134 | * into an internal treasure structure (very linked lists) |
95 | */ |
135 | */ |
96 | |
|
|
97 | static treasure * |
136 | static treasure * |
98 | load_treasure (FILE * fp, int *line) |
137 | read_treasure (object_thawer &f) |
99 | { |
138 | { |
100 | char buf[MAX_BUF], *cp, variable[MAX_BUF]; |
|
|
101 | treasure *t = get_empty_treasure (); |
139 | treasure *t = new treasure; |
102 | int value; |
|
|
103 | |
140 | |
104 | nroftreasures++; |
141 | f.next (); |
105 | while (fgets (buf, MAX_BUF, fp) != NULL) |
|
|
106 | { |
|
|
107 | (*line)++; |
|
|
108 | |
142 | |
109 | if (*buf == '#') |
143 | for (;;) |
110 | continue; |
144 | { |
111 | if ((cp = strchr (buf, '\n')) != NULL) |
145 | coroapi::cede_to_tick_every (10); |
112 | *cp = '\0'; |
|
|
113 | cp = buf; |
|
|
114 | while (isspace (*cp)) /* Skip blanks */ |
|
|
115 | cp++; |
|
|
116 | |
146 | |
117 | if (sscanf (cp, "arch %s", variable)) |
147 | switch (f.kw) |
118 | { |
|
|
119 | if ((t->item = archetype::find (variable)) == NULL) |
|
|
120 | LOG (llevError, "Treasure lacks archetype: %s\n", variable); |
|
|
121 | } |
148 | { |
122 | else if (sscanf (cp, "list %s", variable)) |
149 | case KW_arch: |
123 | t->name = variable; |
150 | t->item = archetype::get (f.get_str ()); |
124 | else if (sscanf (cp, "change_name %s", variable)) |
151 | break; |
125 | t->change_arch.name = variable; |
152 | |
126 | else if (sscanf (cp, "change_title %s", variable)) |
153 | case KW_list: f.get (t->name); break; |
127 | t->change_arch.title = variable; |
154 | case KW_change_name: f.get (t->change_arch.name); break; |
128 | else if (sscanf (cp, "change_slaying %s", variable)) |
155 | case KW_change_title: f.get (t->change_arch.title); break; |
129 | t->change_arch.slaying = variable; |
156 | case KW_change_slaying: f.get (t->change_arch.slaying); break; |
130 | else if (sscanf (cp, "chance %d", &value)) |
157 | case KW_chance: f.get (t->chance); break; |
131 | t->chance = (uint8) value; |
158 | case KW_nrof: f.get (t->nrof); break; |
132 | else if (sscanf (cp, "nrof %d", &value)) |
159 | case KW_magic: f.get (t->magic); break; |
133 | t->nrof = (uint16) value; |
160 | |
134 | else if (sscanf (cp, "magic %d", &value)) |
161 | case KW_yes: t->next_yes = read_treasure (f); continue; |
135 | t->magic = (uint8) value; |
162 | case KW_no: t->next_no = read_treasure (f); continue; |
136 | else if (!strcmp (cp, "yes")) |
163 | |
137 | t->next_yes = load_treasure (fp, line); |
164 | case KW_end: |
138 | else if (!strcmp (cp, "no")) |
165 | f.next (); |
139 | t->next_no = load_treasure (fp, line); |
|
|
140 | else if (!strcmp (cp, "end")) |
|
|
141 | return t; |
|
|
142 | else if (!strcmp (cp, "more")) |
|
|
143 | { |
|
|
144 | t->next = load_treasure (fp, line); |
|
|
145 | return t; |
166 | return t; |
146 | } |
|
|
147 | else |
|
|
148 | LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line); |
|
|
149 | } |
|
|
150 | LOG (llevError, "treasure lacks 'end'.\n"); |
|
|
151 | return t; |
|
|
152 | } |
|
|
153 | |
167 | |
154 | #ifdef TREASURE_DEBUG |
168 | case KW_more: |
|
|
169 | t->next = read_treasure (f); |
|
|
170 | return t; |
155 | |
171 | |
156 | /* recursived checks the linked list. Treasurelist is passed only |
172 | default: |
157 | * so that the treasure name can be printed out |
173 | if (!f.parse_error ("treasurelist", t->name)) |
158 | */ |
174 | return 0; |
159 | static void |
|
|
160 | check_treasurelist (const treasure *t, const treasurelist * tl) |
|
|
161 | { |
|
|
162 | if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) |
|
|
163 | LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); |
|
|
164 | /* find_treasurelist will print out its own error message */ |
|
|
165 | if (t->name && *t->name) |
|
|
166 | find_treasurelist (t->name); |
|
|
167 | if (t->next) |
|
|
168 | check_treasurelist (t->next, tl); |
|
|
169 | if (t->next_yes) |
|
|
170 | check_treasurelist (t->next_yes, tl); |
|
|
171 | if (t->next_no) |
|
|
172 | check_treasurelist (t->next_no, tl); |
|
|
173 | } |
|
|
174 | #endif |
|
|
175 | |
175 | |
|
|
176 | return t; |
|
|
177 | } |
|
|
178 | |
|
|
179 | f.next (); |
|
|
180 | } |
|
|
181 | } |
|
|
182 | |
176 | /* |
183 | /* |
177 | * Opens LIBDIR/treasure and reads all treasure-declarations from it. |
|
|
178 | * Each treasure is parsed with the help of load_treasure(). |
184 | * Each treasure is parsed with the help of load_treasure(). |
179 | */ |
185 | */ |
180 | |
186 | treasurelist * |
181 | void |
187 | treasurelist::read (object_thawer &f) |
182 | load_treasures (void) |
|
|
183 | { |
188 | { |
184 | FILE *fp; |
189 | assert (f.kw == KW_treasure || f.kw == KW_treasureone); |
185 | char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF]; |
|
|
186 | treasurelist *previous = NULL; |
|
|
187 | treasure *t; |
|
|
188 | int comp, line = 0; |
|
|
189 | |
190 | |
190 | sprintf (filename, "%s/%s", settings.datadir, settings.treasures); |
191 | bool one = f.kw == KW_treasureone; |
191 | if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) |
192 | treasurelist *tl = treasurelist::get (f.get_str ()); |
192 | { |
193 | clear (tl); |
193 | LOG (llevError, "Can't open treasure file.\n"); |
194 | tl->items = read_treasure (f); |
|
|
195 | if (!tl->items) |
194 | return; |
196 | return 0; |
195 | } |
|
|
196 | while (fgets (buf, MAX_BUF, fp) != NULL) |
|
|
197 | { |
|
|
198 | line++; |
|
|
199 | if (*buf == '#') |
|
|
200 | continue; |
|
|
201 | |
197 | |
202 | if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name)) |
|
|
203 | { |
|
|
204 | treasurelist *tl = get_empty_treasurelist (); |
|
|
205 | |
|
|
206 | tl->name = name; |
|
|
207 | if (previous == NULL) |
|
|
208 | first_treasurelist = tl; |
|
|
209 | else |
|
|
210 | previous->next = tl; |
|
|
211 | previous = tl; |
|
|
212 | tl->items = load_treasure (fp, &line); |
|
|
213 | |
|
|
214 | /* 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. |
215 | * 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 |
216 | * fields of the treasures are not being used. |
200 | * fields of the treasures are not being used. |
217 | */ |
201 | */ |
218 | if (!strncmp (buf, "treasureone", 11)) |
202 | tl->total_chance = 0; |
|
|
203 | |
|
|
204 | if (one) |
|
|
205 | { |
|
|
206 | for (treasure *t = tl->items; t; t = t->next) |
|
|
207 | { |
|
|
208 | if (t->next_yes || t->next_no) |
219 | { |
209 | { |
220 | for (t = tl->items; t != NULL; t = t->next) |
|
|
221 | { |
|
|
222 | #ifdef TREASURE_DEBUG |
|
|
223 | if (t->next_yes || t->next_no) |
|
|
224 | { |
|
|
225 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); |
210 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); |
226 | LOG (llevError, " the next_yes or next_no field is set\n"); |
211 | LOG (llevError, " the next_yes or next_no field is set\n"); |
227 | } |
|
|
228 | #endif |
|
|
229 | tl->total_chance += t->chance; |
|
|
230 | } |
|
|
231 | } |
212 | } |
232 | } |
|
|
233 | else |
|
|
234 | LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line); |
|
|
235 | } |
|
|
236 | close_and_delete (fp, comp); |
|
|
237 | |
213 | |
238 | #ifdef TREASURE_DEBUG |
214 | tl->total_chance += t->chance; |
239 | /* Perform some checks on how valid the treasure data actually is. |
215 | } |
240 | * verify that list transitions work (ie, the list that it is supposed |
216 | } |
241 | * to transition to exists). Also, verify that at least the name |
|
|
242 | * or archetype is set for each treasure element. |
|
|
243 | */ |
|
|
244 | for (previous = first_treasurelist; previous != NULL; previous = previous->next) |
|
|
245 | check_treasurelist (previous->items, previous); |
|
|
246 | #endif |
|
|
247 | } |
|
|
248 | |
217 | |
249 | /* |
|
|
250 | * Searches for the given treasurelist in the globally linked list |
|
|
251 | * of treasurelists which has been built by load_treasures(). |
|
|
252 | */ |
|
|
253 | |
|
|
254 | treasurelist * |
|
|
255 | find_treasurelist (const char *name) |
|
|
256 | { |
|
|
257 | shstr_cmp name_ (name); |
|
|
258 | |
|
|
259 | if (!name_) |
|
|
260 | return 0; |
|
|
261 | |
|
|
262 | for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next) |
|
|
263 | if (name_ == tl->name) |
|
|
264 | return tl; |
|
|
265 | |
|
|
266 | if (first_treasurelist) |
|
|
267 | LOG (llevError, "Couldn't find treasurelist %s\n", name); |
|
|
268 | |
|
|
269 | return 0; |
218 | return tl; |
270 | } |
219 | } |
271 | |
|
|
272 | |
220 | |
273 | /* |
221 | /* |
274 | * Generates the objects specified by the given treasure. |
222 | * Generates the objects specified by the given treasure. |
275 | * It goes recursively through the rest of the linked list. |
223 | * It goes recursively through the rest of the linked list. |
276 | * If there is a certain percental chance for a treasure to be generated, |
224 | * If there is a certain percental chance for a treasure to be generated, |
… | |
… | |
282 | * start with equipment, but only their abilities). |
230 | * start with equipment, but only their abilities). |
283 | */ |
231 | */ |
284 | static void |
232 | static void |
285 | put_treasure (object *op, object *creator, int flags) |
233 | put_treasure (object *op, object *creator, int flags) |
286 | { |
234 | { |
287 | object *tmp; |
|
|
288 | |
|
|
289 | /* 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 |
290 | * 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 |
291 | * 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 |
292 | * by another object. |
238 | * by another object. |
293 | */ |
239 | */ |
294 | if (flags & GT_ENVIRONMENT && op->type != SPELL) |
240 | if (flags & GT_ENVIRONMENT && op->type != SPELL) |
295 | { |
241 | { |
|
|
242 | if (ob_blocked (op, creator->map, creator->x, creator->y)) |
|
|
243 | op->destroy (); |
|
|
244 | else |
|
|
245 | { |
296 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
246 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
297 | op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); |
247 | op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); |
|
|
248 | } |
298 | } |
249 | } |
299 | else |
250 | else |
300 | { |
251 | { |
301 | op = creator->insert (op); |
252 | op = creator->insert (op); |
302 | |
253 | |
303 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
254 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
304 | monster_check_apply (creator, op); |
255 | monster_check_apply (creator, op); |
305 | |
256 | |
306 | if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) |
257 | if (flags & GT_UPDATE_INV) |
|
|
258 | if (object *tmp = creator->in_player ()) |
307 | esrv_send_item (tmp, op); |
259 | esrv_send_item (tmp, op); |
308 | } |
260 | } |
309 | } |
261 | } |
310 | |
262 | |
311 | /* if there are change_xxx commands in the treasure, we include the changes |
263 | /* if there are change_xxx commands in the treasure, we include the changes |
312 | * in the generated object |
264 | * in the generated object |
… | |
… | |
326 | |
278 | |
327 | if (t->change_arch.slaying) |
279 | if (t->change_arch.slaying) |
328 | op->slaying = t->change_arch.slaying; |
280 | op->slaying = t->change_arch.slaying; |
329 | } |
281 | } |
330 | |
282 | |
331 | void |
283 | static void |
332 | create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) |
284 | create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) |
333 | { |
285 | { |
334 | object *tmp; |
|
|
335 | |
|
|
336 | if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) |
286 | if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) |
337 | { |
287 | { |
338 | if (t->name) |
288 | if (t->name) |
339 | { |
289 | { |
340 | if (difficulty >= t->magic) |
290 | if (difficulty >= t->magic) |
341 | { |
|
|
342 | treasurelist *tl = find_treasurelist (t->name); |
291 | if (treasurelist *tl = treasurelist::find (t->name)) |
343 | if (tl) |
|
|
344 | create_treasure (tl, op, flag, difficulty, tries); |
292 | create_treasure (tl, op, flag, difficulty, tries); |
345 | } |
293 | else |
|
|
294 | LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); |
346 | } |
295 | } |
347 | else |
296 | else |
348 | { |
297 | { |
349 | if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) |
298 | if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) |
350 | { |
299 | { |
351 | tmp = arch_to_object (t->item); |
300 | object *tmp = arch_to_object (t->item); |
|
|
301 | |
352 | if (t->nrof && tmp->nrof <= 1) |
302 | if (t->nrof && tmp->nrof <= 1) |
353 | tmp->nrof = rndm (t->nrof) + 1; |
303 | tmp->nrof = rndm (t->nrof) + 1; |
354 | |
304 | |
355 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
305 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
356 | change_treasure (t, tmp); |
306 | change_treasure (t, tmp); |
357 | put_treasure (tmp, op, flag); |
307 | put_treasure (tmp, op, flag); |
358 | } |
308 | } |
359 | } |
309 | } |
360 | |
310 | |
361 | if (t->next_yes != NULL) |
311 | if (t->next_yes) |
362 | create_all_treasures (t->next_yes, op, flag, difficulty, tries); |
312 | create_all_treasures (t->next_yes, op, flag, difficulty, tries); |
363 | } |
313 | } |
364 | else if (t->next_no != NULL) |
314 | else if (t->next_no) |
365 | create_all_treasures (t->next_no, op, flag, difficulty, tries); |
315 | create_all_treasures (t->next_no, op, flag, difficulty, tries); |
366 | |
316 | |
367 | if (t->next != NULL) |
317 | if (t->next) |
368 | create_all_treasures (t->next, op, flag, difficulty, tries); |
318 | create_all_treasures (t->next, op, flag, difficulty, tries); |
369 | } |
319 | } |
370 | |
320 | |
371 | void |
321 | static void |
372 | create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) |
322 | create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) |
373 | { |
323 | { |
374 | int value = rndm (tl->total_chance); |
324 | int value = rndm (tl->total_chance); |
375 | treasure *t; |
325 | treasure *t; |
376 | |
326 | |
… | |
… | |
378 | { |
328 | { |
379 | LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); |
329 | LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); |
380 | return; |
330 | return; |
381 | } |
331 | } |
382 | |
332 | |
383 | for (t = tl->items; t != NULL; t = t->next) |
333 | for (t = tl->items; t; t = t->next) |
384 | { |
334 | { |
385 | value -= t->chance; |
335 | value -= t->chance; |
386 | |
336 | |
387 | if (value < 0) |
337 | if (value < 0) |
388 | break; |
338 | break; |
389 | } |
339 | } |
390 | |
340 | |
391 | if (!t || value >= 0) |
341 | if (!t || value >= 0) |
392 | { |
|
|
393 | LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); |
342 | cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1); |
394 | abort (); |
|
|
395 | return; |
|
|
396 | } |
|
|
397 | |
343 | |
398 | if (t->name) |
344 | if (t->name) |
399 | { |
345 | { |
400 | if (difficulty >= t->magic) |
346 | if (difficulty >= t->magic) |
401 | { |
347 | { |
402 | treasurelist *tl = find_treasurelist (t->name); |
348 | treasurelist *tl = treasurelist::find (t->name); |
403 | if (tl) |
349 | if (tl) |
404 | create_treasure (tl, op, flag, difficulty, tries); |
350 | create_treasure (tl, op, flag, difficulty, tries); |
405 | } |
351 | } |
406 | else if (t->nrof) |
352 | else if (t->nrof) |
407 | create_one_treasure (tl, op, flag, difficulty, tries); |
353 | create_one_treasure (tl, op, flag, difficulty, tries); |
408 | |
|
|
409 | return; |
|
|
410 | } |
354 | } |
411 | |
|
|
412 | if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) |
355 | else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) |
413 | { |
356 | { |
414 | object *tmp = arch_to_object (t->item); |
357 | if (object *tmp = arch_to_object (t->item)) |
415 | |
358 | { |
416 | if (!tmp) |
|
|
417 | return; |
|
|
418 | |
|
|
419 | if (t->nrof && tmp->nrof <= 1) |
359 | if (t->nrof && tmp->nrof <= 1) |
420 | tmp->nrof = rndm (t->nrof) + 1; |
360 | tmp->nrof = rndm (t->nrof) + 1; |
421 | |
361 | |
422 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
362 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
423 | change_treasure (t, tmp); |
363 | change_treasure (t, tmp); |
424 | put_treasure (tmp, op, flag); |
364 | put_treasure (tmp, op, flag); |
|
|
365 | } |
425 | } |
366 | } |
426 | } |
367 | } |
427 | |
368 | |
428 | /* This calls the appropriate treasure creation function. tries is passed |
369 | /* This calls the appropriate treasure creation function. tries is passed |
429 | * to determine how many list transitions or attempts to create treasure |
370 | * to determine how many list transitions or attempts to create treasure |
… | |
… | |
433 | * to do that. |
374 | * to do that. |
434 | */ |
375 | */ |
435 | void |
376 | void |
436 | create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) |
377 | create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) |
437 | { |
378 | { |
|
|
379 | // empty treasurelists are legal |
|
|
380 | if (!tl->items) |
|
|
381 | return; |
|
|
382 | |
438 | if (tries++ > 100) |
383 | if (tries++ > 100) |
439 | { |
384 | { |
440 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
385 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
441 | return; |
386 | return; |
442 | } |
387 | } |
… | |
… | |
455 | object * |
400 | object * |
456 | generate_treasure (treasurelist *tl, int difficulty) |
401 | generate_treasure (treasurelist *tl, int difficulty) |
457 | { |
402 | { |
458 | difficulty = clamp (difficulty, 1, settings.max_level); |
403 | difficulty = clamp (difficulty, 1, settings.max_level); |
459 | |
404 | |
460 | object *ob = object::create (), *tmp; |
405 | object *ob = object::create (); |
461 | |
406 | |
462 | create_treasure (tl, ob, 0, difficulty, 0); |
407 | create_treasure (tl, ob, 0, difficulty, 0); |
463 | |
408 | |
464 | /* Don't want to free the object we are about to return */ |
409 | /* Don't want to free the object we are about to return */ |
465 | tmp = ob->inv; |
410 | object *tmp = ob->inv; |
466 | if (tmp != NULL) |
411 | if (tmp) |
467 | tmp->remove (); |
412 | tmp->remove (); |
468 | |
413 | |
469 | if (ob->inv) |
414 | if (ob->inv) |
470 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
415 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
471 | |
416 | |
… | |
… | |
479 | * The array has two arguments, the difficulty of the level, and the |
424 | * The array has two arguments, the difficulty of the level, and the |
480 | * magical bonus "wanted". |
425 | * magical bonus "wanted". |
481 | */ |
426 | */ |
482 | |
427 | |
483 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
428 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
484 | |
|
|
485 | /*chance of magic difficulty*/ |
429 | // chance of magic difficulty |
486 | |
|
|
487 | /* +0 +1 +2 +3 +4 */ |
430 | // +0 +1 +2 +3 +4 |
488 | {95, 2, 2, 1, 0}, /*1 */ |
431 | {95, 2, 2, 1, 0}, // 1 |
489 | {92, 5, 2, 1, 0}, /*2 */ |
432 | {92, 5, 2, 1, 0}, // 2 |
490 | {85, 10, 4, 1, 0}, /*3 */ |
433 | {85, 10, 4, 1, 0}, // 3 |
491 | {80, 14, 4, 2, 0}, /*4 */ |
434 | {80, 14, 4, 2, 0}, // 4 |
492 | {75, 17, 5, 2, 1}, /*5 */ |
435 | {75, 17, 5, 2, 1}, // 5 |
493 | {70, 18, 8, 3, 1}, /*6 */ |
436 | {70, 18, 8, 3, 1}, // 6 |
494 | {65, 21, 10, 3, 1}, /*7 */ |
437 | {65, 21, 10, 3, 1}, // 7 |
495 | {60, 22, 12, 4, 2}, /*8 */ |
438 | {60, 22, 12, 4, 2}, // 8 |
496 | {55, 25, 14, 4, 2}, /*9 */ |
439 | {55, 25, 14, 4, 2}, // 9 |
497 | {50, 27, 16, 5, 2}, /*10 */ |
440 | {50, 27, 16, 5, 2}, // 10 |
498 | {45, 28, 18, 6, 3}, /*11 */ |
441 | {45, 28, 18, 6, 3}, // 11 |
499 | {42, 28, 20, 7, 3}, /*12 */ |
442 | {42, 28, 20, 7, 3}, // 12 |
500 | {40, 27, 21, 8, 4}, /*13 */ |
443 | {40, 27, 21, 8, 4}, // 13 |
501 | {38, 25, 22, 10, 5}, /*14 */ |
444 | {38, 25, 22, 10, 5}, // 14 |
502 | {36, 23, 23, 12, 6}, /*15 */ |
445 | {36, 23, 23, 12, 6}, // 15 |
503 | {33, 21, 24, 14, 8}, /*16 */ |
446 | {33, 21, 24, 14, 8}, // 16 |
504 | {31, 19, 25, 16, 9}, /*17 */ |
447 | {31, 19, 25, 16, 9}, // 17 |
505 | {27, 15, 30, 18, 10}, /*18 */ |
448 | {27, 15, 30, 18, 10}, // 18 |
506 | {20, 12, 30, 25, 13}, /*19 */ |
449 | {20, 12, 30, 25, 13}, // 19 |
507 | {15, 10, 28, 30, 17}, /*20 */ |
450 | {15, 10, 28, 30, 17}, // 20 |
508 | {13, 9, 27, 28, 23}, /*21 */ |
451 | {13, 9, 27, 28, 23}, // 21 |
509 | {10, 8, 25, 28, 29}, /*22 */ |
452 | {10, 8, 25, 28, 29}, // 22 |
510 | {8, 7, 23, 26, 36}, /*23 */ |
453 | { 8, 7, 23, 26, 36}, // 23 |
511 | {6, 6, 20, 22, 46}, /*24 */ |
454 | { 6, 6, 20, 22, 46}, // 24 |
512 | {4, 5, 17, 18, 56}, /*25 */ |
455 | { 4, 5, 17, 18, 56}, // 25 |
513 | {2, 4, 12, 14, 68}, /*26 */ |
456 | { 2, 4, 12, 14, 68}, // 26 |
514 | {0, 3, 7, 10, 80}, /*27 */ |
457 | { 0, 3, 7, 10, 80}, // 27 |
515 | {0, 0, 3, 7, 90}, /*28 */ |
458 | { 0, 0, 3, 7, 90}, // 28 |
516 | {0, 0, 0, 3, 97}, /*29 */ |
459 | { 0, 0, 0, 3, 97}, // 29 |
517 | {0, 0, 0, 0, 100}, /*30 */ |
460 | { 0, 0, 0, 0, 100}, // 30 |
518 | {0, 0, 0, 0, 100}, /*31 */ |
461 | { 0, 0, 0, 0, 100}, // 31 |
519 | }; |
462 | }; |
520 | |
|
|
521 | |
463 | |
522 | /* calculate the appropriate level for wands staves and scrolls. |
464 | /* calculate the appropriate level for wands staves and scrolls. |
523 | * This code presumes that op has had its spell object created (in op->inv) |
465 | * This code presumes that op has had its spell object created (in op->inv) |
524 | * |
466 | * |
525 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
467 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
526 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
468 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
527 | */ |
469 | */ |
528 | |
|
|
529 | int |
470 | int |
530 | level_for_item (const object *op, int difficulty) |
471 | level_for_item (const object *op, int difficulty) |
531 | { |
472 | { |
532 | int olevel = 0; |
473 | int olevel = 0; |
533 | |
474 | |
… | |
… | |
556 | * elmex Thu Aug 10 18:45:44 CEST 2006: |
497 | * elmex Thu Aug 10 18:45:44 CEST 2006: |
557 | * Scaling difficulty by max_level, as difficulty is a level and not some |
498 | * Scaling difficulty by max_level, as difficulty is a level and not some |
558 | * weird integer between 1-31. |
499 | * weird integer between 1-31. |
559 | * |
500 | * |
560 | */ |
501 | */ |
561 | |
|
|
562 | int |
502 | int |
563 | magic_from_difficulty (int difficulty) |
503 | magic_from_difficulty (int difficulty) |
564 | { |
504 | { |
565 | int percent = 0, magic = 0; |
505 | int percent = 0, magic = 0; |
566 | int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); |
506 | int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); |
… | |
… | |
654 | * 1) Since rings can have multiple bonuses, if the same bonus |
594 | * 1) Since rings can have multiple bonuses, if the same bonus |
655 | * is rolled again, increase it - the bonuses now stack with |
595 | * is rolled again, increase it - the bonuses now stack with |
656 | * other bonuses previously rolled and ones the item might natively have. |
596 | * other bonuses previously rolled and ones the item might natively have. |
657 | * 2) Add code to deal with new PR method. |
597 | * 2) Add code to deal with new PR method. |
658 | */ |
598 | */ |
659 | |
|
|
660 | void |
599 | void |
661 | set_ring_bonus (object *op, int bonus) |
600 | set_ring_bonus (object *op, int bonus) |
662 | { |
601 | { |
663 | |
602 | |
664 | int r = rndm (bonus > 0 ? 25 : 11); |
603 | int r = rndm (bonus > 0 ? 25 : 11); |
… | |
… | |
845 | save_item_power = op->item_power; |
784 | save_item_power = op->item_power; |
846 | op->item_power = 0; |
785 | op->item_power = 0; |
847 | |
786 | |
848 | if (op->randomitems && op->type != SPELL) |
787 | if (op->randomitems && op->type != SPELL) |
849 | { |
788 | { |
850 | create_treasure (op->randomitems, op, flags, difficulty, 0); |
789 | create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0); |
851 | if (!op->inv) |
|
|
852 | LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name); |
|
|
853 | |
|
|
854 | /* So the treasure doesn't get created again */ |
790 | /* So the treasure doesn't get created again */ |
855 | op->randomitems = NULL; |
791 | op->randomitems = 0; |
856 | } |
792 | } |
857 | |
793 | |
858 | if (difficulty < 1) |
794 | if (difficulty < 1) |
859 | difficulty = 1; |
795 | difficulty = 1; |
860 | |
796 | |
… | |
… | |
1176 | * Allocate and return the pointer to an empty artifactlist structure. |
1112 | * Allocate and return the pointer to an empty artifactlist structure. |
1177 | */ |
1113 | */ |
1178 | static artifactlist * |
1114 | static artifactlist * |
1179 | get_empty_artifactlist (void) |
1115 | get_empty_artifactlist (void) |
1180 | { |
1116 | { |
1181 | artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); |
1117 | return salloc0 <artifactlist> (); |
1182 | |
|
|
1183 | if (al == NULL) |
|
|
1184 | fatal (OUT_OF_MEMORY); |
|
|
1185 | al->next = NULL; |
|
|
1186 | al->items = NULL; |
|
|
1187 | al->total_chance = 0; |
|
|
1188 | return al; |
|
|
1189 | } |
1118 | } |
1190 | |
1119 | |
1191 | /* |
1120 | /* |
1192 | * Allocate and return the pointer to an empty artifact structure. |
1121 | * Allocate and return the pointer to an empty artifact structure. |
1193 | */ |
1122 | */ |
1194 | static artifact * |
1123 | static artifact * |
1195 | get_empty_artifact (void) |
1124 | get_empty_artifact (void) |
1196 | { |
1125 | { |
1197 | artifact *a = (artifact *) malloc (sizeof (artifact)); |
1126 | return salloc0 <artifact> (); |
1198 | |
|
|
1199 | if (a == NULL) |
|
|
1200 | fatal (OUT_OF_MEMORY); |
|
|
1201 | |
|
|
1202 | a->item = NULL; |
|
|
1203 | a->next = NULL; |
|
|
1204 | a->chance = 0; |
|
|
1205 | a->difficulty = 0; |
|
|
1206 | a->allowed = NULL; |
|
|
1207 | return a; |
|
|
1208 | } |
1127 | } |
1209 | |
1128 | |
1210 | /* |
1129 | /* |
1211 | * Searches the artifact lists and returns one that has the same type |
1130 | * Searches the artifact lists and returns one that has the same type |
1212 | * of objects on it. |
1131 | * of objects on it. |
1213 | */ |
1132 | */ |
1214 | artifactlist * |
1133 | artifactlist * |
1215 | find_artifactlist (int type) |
1134 | find_artifactlist (int type) |
1216 | { |
1135 | { |
1217 | artifactlist *al; |
|
|
1218 | |
|
|
1219 | for (al = first_artifactlist; al; al = al->next) |
1136 | for (artifactlist *al = first_artifactlist; al; al = al->next) |
1220 | if (al->type == type) |
1137 | if (al->type == type) |
1221 | return al; |
1138 | return al; |
1222 | |
1139 | |
1223 | return 0; |
1140 | return 0; |
1224 | } |
1141 | } |
… | |
… | |
1261 | treasurelist *tl; |
1178 | treasurelist *tl; |
1262 | int i; |
1179 | int i; |
1263 | |
1180 | |
1264 | if (depth > 100) |
1181 | if (depth > 100) |
1265 | return; |
1182 | return; |
|
|
1183 | |
1266 | while (t) |
1184 | while (t) |
1267 | { |
1185 | { |
1268 | if (t->name) |
1186 | if (t->name) |
1269 | { |
1187 | { |
1270 | for (i = 0; i < depth; i++) |
1188 | for (i = 0; i < depth; i++) |
1271 | fprintf (logfile, " "); |
1189 | fprintf (logfile, " "); |
|
|
1190 | |
1272 | fprintf (logfile, "{ (list: %s)\n", &t->name); |
1191 | fprintf (logfile, "{ (list: %s)\n", &t->name); |
|
|
1192 | |
1273 | tl = find_treasurelist (t->name); |
1193 | tl = treasurelist::find (t->name); |
1274 | if (tl) |
1194 | if (tl) |
1275 | dump_monster_treasure_rec (name, tl->items, depth + 2); |
1195 | dump_monster_treasure_rec (name, tl->items, depth + 2); |
|
|
1196 | |
1276 | for (i = 0; i < depth; i++) |
1197 | for (i = 0; i < depth; i++) |
1277 | fprintf (logfile, " "); |
1198 | fprintf (logfile, " "); |
|
|
1199 | |
1278 | fprintf (logfile, "} (end of list: %s)\n", &t->name); |
1200 | fprintf (logfile, "} (end of list: %s)\n", &t->name); |
1279 | } |
1201 | } |
1280 | else |
1202 | else |
1281 | { |
1203 | { |
1282 | for (i = 0; i < depth; i++) |
1204 | for (i = 0; i < depth; i++) |
1283 | fprintf (logfile, " "); |
1205 | fprintf (logfile, " "); |
|
|
1206 | |
1284 | if (t->item && t->item->clone.type == FLESH) |
1207 | if (t->item && t->item->clone.type == FLESH) |
1285 | fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); |
1208 | fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); |
1286 | else |
1209 | else |
1287 | fprintf (logfile, "%s\n", &t->item->clone.name); |
1210 | fprintf (logfile, "%s\n", &t->item->clone.name); |
1288 | } |
1211 | } |
1289 | |
1212 | |
1290 | if (t->next_yes) |
1213 | if (t->next_yes) |
1291 | { |
1214 | { |
1292 | for (i = 0; i < depth; i++) |
1215 | for (i = 0; i < depth; i++) |
1293 | fprintf (logfile, " "); |
1216 | fprintf (logfile, " "); |
|
|
1217 | |
1294 | fprintf (logfile, " (if yes)\n"); |
1218 | fprintf (logfile, " (if yes)\n"); |
1295 | dump_monster_treasure_rec (name, t->next_yes, depth + 1); |
1219 | dump_monster_treasure_rec (name, t->next_yes, depth + 1); |
1296 | } |
1220 | } |
1297 | |
1221 | |
1298 | if (t->next_no) |
1222 | if (t->next_no) |
1299 | { |
1223 | { |
1300 | for (i = 0; i < depth; i++) |
1224 | for (i = 0; i < depth; i++) |
1301 | fprintf (logfile, " "); |
1225 | fprintf (logfile, " "); |
|
|
1226 | |
1302 | fprintf (logfile, " (if no)\n"); |
1227 | fprintf (logfile, " (if no)\n"); |
1303 | dump_monster_treasure_rec (name, t->next_no, depth + 1); |
1228 | dump_monster_treasure_rec (name, t->next_no, depth + 1); |
1304 | } |
1229 | } |
1305 | |
1230 | |
1306 | t = t->next; |
1231 | t = t->next; |
… | |
… | |
1309 | |
1234 | |
1310 | /* |
1235 | /* |
1311 | * For debugging purposes. Dumps all treasures for a given monster. |
1236 | * For debugging purposes. Dumps all treasures for a given monster. |
1312 | * Created originally by Raphael Quinet for debugging the alchemy code. |
1237 | * Created originally by Raphael Quinet for debugging the alchemy code. |
1313 | */ |
1238 | */ |
1314 | |
|
|
1315 | void |
1239 | void |
1316 | dump_monster_treasure (const char *name) |
1240 | dump_monster_treasure (const char *name) |
1317 | { |
1241 | { |
1318 | archetype *at; |
1242 | archetype *at; |
1319 | int found; |
1243 | int found; |
… | |
… | |
1366 | { |
1290 | { |
1367 | switch (f.kw) |
1291 | switch (f.kw) |
1368 | { |
1292 | { |
1369 | case KW_allowed: |
1293 | case KW_allowed: |
1370 | if (!art) |
1294 | if (!art) |
1371 | { |
|
|
1372 | art = get_empty_artifact (); |
1295 | art = get_empty_artifact (); |
1373 | nrofartifacts++; |
|
|
1374 | } |
|
|
1375 | |
1296 | |
1376 | { |
1297 | { |
1377 | if (!strcmp (f.get_str (), "all")) |
1298 | if (!strcmp (f.get_str (), "all")) |
1378 | break; |
1299 | break; |
1379 | |
1300 | |
1380 | char *next, *cp = f.get_str (); |
1301 | char *next, *cp = f.get_str (); |
1381 | |
1302 | |
1382 | do |
1303 | do |
1383 | { |
1304 | { |
1384 | nrofallowedstr++; |
|
|
1385 | |
|
|
1386 | if ((next = strchr (cp, ','))) |
1305 | if ((next = strchr (cp, ','))) |
1387 | *next++ = '\0'; |
1306 | *next++ = '\0'; |
1388 | |
1307 | |
1389 | linked_char *tmp = new linked_char; |
1308 | linked_char *tmp = new linked_char; |
1390 | |
1309 | |
… | |
… | |
1405 | break; |
1324 | break; |
1406 | |
1325 | |
1407 | case KW_object: |
1326 | case KW_object: |
1408 | { |
1327 | { |
1409 | art->item = object::create (); |
1328 | art->item = object::create (); |
|
|
1329 | f.get (art->item->name); |
|
|
1330 | f.next (); |
1410 | |
1331 | |
1411 | if (!art->item->parse_kv (f)) |
1332 | if (!art->item->parse_kv (f)) |
1412 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
1333 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
1413 | |
1334 | |
1414 | al = find_artifactlist (art->item->type); |
1335 | al = find_artifactlist (art->item->type); |
… | |
… | |
1440 | } |
1361 | } |
1441 | |
1362 | |
1442 | done: |
1363 | done: |
1443 | for (al = first_artifactlist; al; al = al->next) |
1364 | for (al = first_artifactlist; al; al = al->next) |
1444 | { |
1365 | { |
|
|
1366 | al->total_chance = 0; |
|
|
1367 | |
1445 | for (art = al->items; art; art = art->next) |
1368 | for (art = al->items; art; art = art->next) |
1446 | { |
1369 | { |
1447 | if (!art->chance) |
1370 | if (!art->chance) |
1448 | LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); |
1371 | LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); |
1449 | else |
1372 | else |
… | |
… | |
1455 | } |
1378 | } |
1456 | |
1379 | |
1457 | LOG (llevDebug, "done.\n"); |
1380 | LOG (llevDebug, "done.\n"); |
1458 | } |
1381 | } |
1459 | |
1382 | |
1460 | |
|
|
1461 | /* |
1383 | /* |
1462 | * Used in artifact generation. The bonuses of the first object |
1384 | * Used in artifact generation. The bonuses of the first object |
1463 | * is modified by the bonuses of the second object. |
1385 | * is modified by the bonuses of the second object. |
1464 | */ |
1386 | */ |
1465 | |
|
|
1466 | void |
1387 | void |
1467 | add_abilities (object *op, object *change) |
1388 | add_abilities (object *op, object *change) |
1468 | { |
1389 | { |
1469 | int i, tmp; |
1390 | int i, tmp; |
1470 | |
1391 | |
1471 | if (change->face != blank_face) |
1392 | if (change->face != blank_face) |
1472 | { |
1393 | { |
1473 | #ifdef TREASURE_VERBOSE |
1394 | #ifdef TREASURE_VERBOSE |
1474 | LOG (llevDebug, "FACE: %d\n", change->face->number); |
1395 | LOG (llevDebug, "add_abilities change face: %d\n", change->face); |
1475 | #endif |
1396 | #endif |
1476 | op->face = change->face; |
1397 | op->face = change->face; |
1477 | } |
1398 | } |
1478 | |
1399 | |
1479 | for (i = 0; i < NUM_STATS; i++) |
1400 | for (i = 0; i < NUM_STATS; i++) |
… | |
… | |
1660 | if (art->allowed == (linked_char *) NULL) |
1581 | if (art->allowed == (linked_char *) NULL) |
1661 | return 1; /* Ie, "all" */ |
1582 | return 1; /* Ie, "all" */ |
1662 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1583 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1663 | { |
1584 | { |
1664 | #ifdef TREASURE_VERBOSE |
1585 | #ifdef TREASURE_VERBOSE |
1665 | LOG (llevDebug, "legal_art: %s\n", tmp->name); |
1586 | LOG (llevDebug, "legal_art: %s\n", &tmp->name); |
1666 | #endif |
1587 | #endif |
1667 | if (*tmp->name == '!') |
1588 | if (*tmp->name == '!') |
1668 | name = tmp->name + 1, neg = 1; |
1589 | name = tmp->name + 1, neg = 1; |
1669 | else |
1590 | else |
1670 | name = tmp->name, neg = 0; |
1591 | name = tmp->name, neg = 0; |
… | |
… | |
1765 | continue; |
1686 | continue; |
1766 | |
1687 | |
1767 | if (!legal_artifact_combination (op, art)) |
1688 | if (!legal_artifact_combination (op, art)) |
1768 | { |
1689 | { |
1769 | #ifdef TREASURE_VERBOSE |
1690 | #ifdef TREASURE_VERBOSE |
1770 | LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); |
1691 | LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name); |
1771 | #endif |
1692 | #endif |
1772 | continue; |
1693 | continue; |
1773 | } |
1694 | } |
|
|
1695 | |
1774 | give_artifact_abilities (op, art->item); |
1696 | give_artifact_abilities (op, art->item); |
1775 | return; |
1697 | return; |
1776 | } |
1698 | } |
1777 | } |
1699 | } |
1778 | |
1700 | |
… | |
… | |
1822 | SET_FLAG (item, FLAG_NO_STEAL); |
1744 | SET_FLAG (item, FLAG_NO_STEAL); |
1823 | } |
1745 | } |
1824 | } |
1746 | } |
1825 | |
1747 | |
1826 | /* special_potion() - so that old potion code is still done right. */ |
1748 | /* special_potion() - so that old potion code is still done right. */ |
1827 | |
|
|
1828 | int |
1749 | int |
1829 | special_potion (object *op) |
1750 | special_potion (object *op) |
1830 | { |
1751 | { |
1831 | if (op->attacktype) |
1752 | if (op->attacktype) |
1832 | return 1; |
1753 | return 1; |
… | |
… | |
1842 | } |
1763 | } |
1843 | |
1764 | |
1844 | void |
1765 | void |
1845 | free_treasurestruct (treasure *t) |
1766 | free_treasurestruct (treasure *t) |
1846 | { |
1767 | { |
1847 | if (t->next) |
|
|
1848 | free_treasurestruct (t->next); |
1768 | if (t->next) free_treasurestruct (t->next); |
1849 | if (t->next_yes) |
|
|
1850 | free_treasurestruct (t->next_yes); |
1769 | if (t->next_yes) free_treasurestruct (t->next_yes); |
1851 | if (t->next_no) |
|
|
1852 | free_treasurestruct (t->next_no); |
1770 | if (t->next_no) free_treasurestruct (t->next_no); |
1853 | |
1771 | |
1854 | delete t; |
1772 | delete t; |
1855 | } |
1773 | } |
1856 | |
1774 | |
1857 | void |
1775 | void |
… | |
… | |
1862 | |
1780 | |
1863 | delete lc; |
1781 | delete lc; |
1864 | } |
1782 | } |
1865 | |
1783 | |
1866 | void |
1784 | void |
1867 | free_artifact (artifact * at) |
1785 | free_artifact (artifact *at) |
1868 | { |
1786 | { |
1869 | if (at->next) |
|
|
1870 | free_artifact (at->next); |
1787 | if (at->next) free_artifact (at->next); |
1871 | |
|
|
1872 | if (at->allowed) |
|
|
1873 | free_charlinks (at->allowed); |
1788 | if (at->allowed) free_charlinks (at->allowed); |
1874 | |
1789 | |
1875 | at->item->destroy (1); |
1790 | at->item->destroy (1); |
1876 | |
1791 | |
1877 | delete at; |
1792 | sfree (at); |
1878 | } |
1793 | } |
1879 | |
1794 | |
1880 | void |
1795 | void |
1881 | free_artifactlist (artifactlist * al) |
1796 | free_artifactlist (artifactlist *al) |
1882 | { |
1797 | { |
1883 | artifactlist *nextal; |
1798 | artifactlist *nextal; |
1884 | |
1799 | |
1885 | for (al = first_artifactlist; al; al = nextal) |
1800 | for (al = first_artifactlist; al; al = nextal) |
1886 | { |
1801 | { |
1887 | nextal = al->next; |
1802 | nextal = al->next; |
1888 | |
1803 | |
1889 | if (al->items) |
1804 | if (al->items) |
1890 | free_artifact (al->items); |
1805 | free_artifact (al->items); |
1891 | |
1806 | |
1892 | free (al); |
1807 | sfree (al); |
1893 | } |
1808 | } |
1894 | } |
1809 | } |
1895 | |
1810 | |
1896 | void |
1811 | void |
1897 | free_all_treasures (void) |
1812 | free_all_treasures (void) |
1898 | { |
1813 | { |
1899 | treasurelist *tl, *next; |
1814 | treasurelist *tl, *next; |
1900 | |
1815 | |
1901 | |
|
|
1902 | for (tl = first_treasurelist; tl != NULL; tl = next) |
1816 | for (tl = first_treasurelist; tl; tl = next) |
1903 | { |
1817 | { |
|
|
1818 | clear (tl); |
|
|
1819 | |
1904 | next = tl->next; |
1820 | next = tl->next; |
1905 | if (tl->items) |
|
|
1906 | free_treasurestruct (tl->items); |
|
|
1907 | delete tl; |
1821 | delete tl; |
1908 | } |
1822 | } |
|
|
1823 | |
1909 | free_artifactlist (first_artifactlist); |
1824 | free_artifactlist (first_artifactlist); |
1910 | } |
1825 | } |