1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * 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 |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
19 | * along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
21 | * |
20 | * |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /* TREASURE_DEBUG does some checking on the treasurelists after loading. |
24 | /* TREASURE_DEBUG does some checking on the treasurelists after loading. |
26 | * It is useful for finding bugs in the treasures file. Since it only |
25 | * It is useful for finding bugs in the treasures file. Since it only |
27 | * slows the startup some (and not actual game play), it is by default |
26 | * slows the startup some (and not actual game play), it is by default |
… | |
… | |
54 | > tl_map_t; |
53 | > tl_map_t; |
55 | |
54 | |
56 | static tl_map_t tl_map; |
55 | static tl_map_t tl_map; |
57 | |
56 | |
58 | /* |
57 | /* |
59 | * Initialize global archtype pointers: |
|
|
60 | */ |
|
|
61 | void |
|
|
62 | init_archetype_pointers () |
|
|
63 | { |
|
|
64 | int prev_warn = warn_archetypes; |
|
|
65 | |
|
|
66 | warn_archetypes = 1; |
|
|
67 | |
|
|
68 | if (ring_arch == NULL) |
|
|
69 | ring_arch = archetype::find ("ring"); |
|
|
70 | if (amulet_arch == NULL) |
|
|
71 | amulet_arch = archetype::find ("amulet"); |
|
|
72 | if (staff_arch == NULL) |
|
|
73 | staff_arch = archetype::find ("staff"); |
|
|
74 | if (crown_arch == NULL) |
|
|
75 | crown_arch = archetype::find ("crown"); |
|
|
76 | |
|
|
77 | warn_archetypes = prev_warn; |
|
|
78 | } |
|
|
79 | |
|
|
80 | /* |
|
|
81 | * Searches for the given treasurelist |
58 | * Searches for the given treasurelist |
82 | */ |
59 | */ |
83 | treasurelist * |
60 | treasurelist * |
84 | treasurelist::find (const char *name) |
61 | treasurelist::find (const char *name) |
85 | { |
62 | { |
… | |
… | |
128 | } |
105 | } |
129 | |
106 | |
130 | tl->total_chance = 0; |
107 | tl->total_chance = 0; |
131 | } |
108 | } |
132 | |
109 | |
|
|
110 | #ifdef TREASURE_DEBUG |
|
|
111 | /* recursived checks the linked list. Treasurelist is passed only |
|
|
112 | * so that the treasure name can be printed out |
|
|
113 | */ |
|
|
114 | static void |
|
|
115 | check_treasurelist (const treasure *t, const treasurelist * tl) |
|
|
116 | { |
|
|
117 | if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) |
|
|
118 | LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); |
|
|
119 | |
|
|
120 | if (t->next) |
|
|
121 | check_treasurelist (t->next, tl); |
|
|
122 | |
|
|
123 | if (t->next_yes) |
|
|
124 | check_treasurelist (t->next_yes, tl); |
|
|
125 | |
|
|
126 | if (t->next_no) |
|
|
127 | check_treasurelist (t->next_no, tl); |
|
|
128 | } |
|
|
129 | #endif |
|
|
130 | |
133 | /* |
131 | /* |
134 | * Reads the lib/treasure file from disk, and parses the contents |
132 | * Reads the lib/treasure file from disk, and parses the contents |
135 | * into an internal treasure structure (very linked lists) |
133 | * into an internal treasure structure (very linked lists) |
136 | */ |
134 | */ |
137 | static treasure * |
135 | static treasure * |
138 | load_treasure (object_thawer &f) |
136 | read_treasure (object_thawer &f) |
139 | { |
137 | { |
140 | treasure *t = new treasure; |
138 | treasure *t = new treasure; |
141 | int value; |
|
|
142 | |
139 | |
143 | nroftreasures++; |
140 | f.next (); |
144 | |
141 | |
145 | for (;;) |
142 | for (;;) |
146 | { |
143 | { |
147 | coroapi::cede_to_tick_every (10); |
144 | coroapi::cede_to_tick (); |
148 | |
|
|
149 | f.next (); |
|
|
150 | |
145 | |
151 | switch (f.kw) |
146 | switch (f.kw) |
152 | { |
147 | { |
153 | case KW_arch: |
148 | case KW_arch: |
154 | if (!(t->item = archetype::find (f.get_str ()))) |
149 | t->item = archetype::find (f.get_str ()); |
155 | LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ()); |
150 | |
|
|
151 | if (!t->item) |
|
|
152 | { |
|
|
153 | f.parse_warn ("treasure references unknown archetype"); |
|
|
154 | t->item = archetype::empty; |
|
|
155 | } |
|
|
156 | |
156 | break; |
157 | break; |
157 | |
158 | |
158 | case KW_list: f.get (t->name); break; |
159 | case KW_list: f.get (t->name); break; |
159 | case KW_change_name: f.get (t->change_arch.name); break; |
160 | case KW_change_name: f.get (t->change_arch.name); break; |
160 | case KW_change_title: f.get (t->change_arch.title); break; |
161 | case KW_change_title: f.get (t->change_arch.title); break; |
161 | case KW_change_slaying: f.get (t->change_arch.slaying); break; |
162 | case KW_change_slaying: f.get (t->change_arch.slaying); break; |
162 | case KW_chance: f.get (t->chance); break; |
163 | case KW_chance: f.get (t->chance); break; |
163 | case KW_nrof: f.get (t->nrof); break; |
164 | case KW_nrof: f.get (t->nrof); break; |
164 | case KW_magic: f.get (t->magic); break; |
165 | case KW_magic: f.get (t->magic); break; |
165 | |
166 | |
166 | case KW_yes: t->next_yes = load_treasure (f); break; |
167 | case KW_yes: t->next_yes = read_treasure (f); continue; |
167 | case KW_no: t->next_no = load_treasure (f); break; |
168 | case KW_no: t->next_no = read_treasure (f); continue; |
168 | |
169 | |
169 | case KW_end: |
170 | case KW_end: |
|
|
171 | f.next (); |
170 | return t; |
172 | return t; |
171 | |
173 | |
172 | case KW_more: |
174 | case KW_more: |
173 | t->next = load_treasure (f); |
175 | t->next = read_treasure (f); |
174 | return t; |
176 | return t; |
175 | |
177 | |
176 | default: |
178 | default: |
177 | if (!f.parse_error ("treasure list")) |
179 | if (!f.parse_error ("treasurelist", t->name)) |
178 | return t; // error |
180 | goto error; |
179 | |
181 | |
180 | return t; |
182 | return t; |
181 | } |
183 | } |
182 | } |
|
|
183 | } |
|
|
184 | |
184 | |
185 | #ifdef TREASURE_DEBUG |
185 | f.next (); |
186 | /* recursived checks the linked list. Treasurelist is passed only |
186 | } |
187 | * so that the treasure name can be printed out |
|
|
188 | */ |
|
|
189 | static void |
|
|
190 | check_treasurelist (const treasure *t, const treasurelist * tl) |
|
|
191 | { |
|
|
192 | if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) |
|
|
193 | LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); |
|
|
194 | |
187 | |
195 | if (t->next) |
188 | // not reached |
196 | check_treasurelist (t->next, tl); |
|
|
197 | |
189 | |
198 | if (t->next_yes) |
190 | error: |
199 | check_treasurelist (t->next_yes, tl); |
191 | delete t; |
200 | |
192 | return 0; |
201 | if (t->next_no) |
|
|
202 | check_treasurelist (t->next_no, tl); |
|
|
203 | } |
193 | } |
204 | #endif |
|
|
205 | |
194 | |
206 | /* |
195 | /* |
207 | * Opens LIBDIR/treasure and reads all treasure-declarations from it. |
|
|
208 | * Each treasure is parsed with the help of load_treasure(). |
196 | * Each treasure is parsed with the help of load_treasure(). |
209 | */ |
197 | */ |
210 | bool |
198 | treasurelist * |
211 | load_treasure_file (const char *filename) |
199 | treasurelist::read (object_thawer &f) |
212 | { |
200 | { |
213 | treasure *t; |
201 | assert (f.kw == KW_treasure || f.kw == KW_treasureone); |
214 | int comp, line = 0; |
|
|
215 | |
202 | |
216 | object_thawer f (filename); |
203 | bool one = f.kw == KW_treasureone; |
217 | |
204 | treasurelist *tl = treasurelist::get (f.get_str ()); |
218 | if (!f) |
205 | clear (tl); |
219 | { |
206 | tl->items = read_treasure (f); |
220 | LOG (llevError, "Can't open treasure file.\n"); |
207 | if (!tl->items) |
221 | return false; |
208 | return 0; |
|
|
209 | |
|
|
210 | /* This is a one of the many items on the list should be generated. |
|
|
211 | * Add up the chance total, and check to make sure the yes & no |
|
|
212 | * fields of the treasures are not being used. |
|
|
213 | */ |
|
|
214 | if (one) |
222 | } |
215 | { |
223 | |
216 | for (treasure *t = tl->items; t; t = t->next) |
224 | f.next (); |
|
|
225 | |
|
|
226 | for (;;) |
|
|
227 | { |
|
|
228 | switch (f.kw) |
|
|
229 | { |
217 | { |
230 | case KW_treasure: |
218 | if (t->next_yes || t->next_no) |
231 | case KW_treasureone: |
|
|
232 | { |
219 | { |
233 | bool one = f.kw == KW_treasureone; |
|
|
234 | treasurelist *tl = treasurelist::get (f.get_str ()); |
|
|
235 | |
|
|
236 | clear (tl); |
|
|
237 | tl->items = load_treasure (f); |
|
|
238 | |
|
|
239 | if (!tl->items) |
|
|
240 | return false; |
|
|
241 | |
|
|
242 | /* This is a one of the many items on the list should be generated. |
|
|
243 | * Add up the chance total, and check to make sure the yes & no |
|
|
244 | * fields of the treasures are not being used. |
|
|
245 | */ |
|
|
246 | if (one) |
|
|
247 | { |
|
|
248 | for (t = tl->items; t; t = t->next) |
|
|
249 | { |
|
|
250 | #ifdef TREASURE_DEBUG |
|
|
251 | if (t->next_yes || t->next_no) |
|
|
252 | { |
|
|
253 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); |
220 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name); |
254 | LOG (llevError, " the next_yes or next_no field is set\n"); |
221 | LOG (llevError, " the next_yes or next_no field is set\n"); |
255 | } |
|
|
256 | #endif |
|
|
257 | tl->total_chance += t->chance; |
|
|
258 | } |
|
|
259 | } |
|
|
260 | } |
222 | } |
261 | break; |
|
|
262 | |
223 | |
263 | case KW_EOF: |
224 | tl->total_chance += t->chance; |
264 | #ifdef TREASURE_DEBUG |
|
|
265 | /* Perform some checks on how valid the treasure data actually is. |
|
|
266 | * verify that list transitions work (ie, the list that it is supposed |
|
|
267 | * to transition to exists). Also, verify that at least the name |
|
|
268 | * or archetype is set for each treasure element. |
|
|
269 | */ |
|
|
270 | for (treasurelist *tl = first_treasurelist; tl; tl = tl->next) |
|
|
271 | check_treasurelist (tl->items, tl); |
|
|
272 | #endif |
|
|
273 | return true; |
|
|
274 | |
|
|
275 | default: |
|
|
276 | if (!f.parse_error ("treasure lists")) |
|
|
277 | return false; |
|
|
278 | |
|
|
279 | break; |
|
|
280 | } |
225 | } |
281 | |
|
|
282 | f.next (); |
|
|
283 | } |
226 | } |
|
|
227 | |
|
|
228 | return tl; |
284 | } |
229 | } |
285 | |
230 | |
286 | /* |
231 | /* |
287 | * Generates the objects specified by the given treasure. |
232 | * Generates the objects specified by the given treasure. |
288 | * It goes recursively through the rest of the linked list. |
233 | * It goes recursively through the rest of the linked list. |
… | |
… | |
295 | * start with equipment, but only their abilities). |
240 | * start with equipment, but only their abilities). |
296 | */ |
241 | */ |
297 | static void |
242 | static void |
298 | put_treasure (object *op, object *creator, int flags) |
243 | put_treasure (object *op, object *creator, int flags) |
299 | { |
244 | { |
300 | object *tmp; |
245 | if (flags & GT_ENVIRONMENT) |
301 | |
246 | { |
302 | /* Bit of a hack - spells should never be put onto the map. The entire |
247 | /* Bit of a hack - spells should never be put onto the map. The entire |
303 | * treasure stuff is a problem - there is no clear idea of knowing |
248 | * treasure stuff is a problem - there is no clear idea of knowing |
304 | * this is the original object, or if this is an object that should be created |
249 | * this is the original object, or if this is an object that should be created |
305 | * by another object. |
250 | * by another object. |
306 | */ |
251 | */ |
307 | if (flags & GT_ENVIRONMENT && op->type != SPELL) |
252 | //TODO: flag such as objects... as such (no drop, anybody?) |
308 | { |
253 | if (op->type == SPELL) |
|
|
254 | { |
|
|
255 | op->destroy (); |
|
|
256 | return; |
|
|
257 | } |
|
|
258 | |
|
|
259 | op->expand_tail (); |
|
|
260 | |
|
|
261 | if (op->blocked (creator->map, creator->x, creator->y)) |
|
|
262 | op->destroy (); |
|
|
263 | else |
|
|
264 | { |
309 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
265 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
310 | op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); |
266 | op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); |
|
|
267 | } |
311 | } |
268 | } |
312 | else |
269 | else |
313 | { |
270 | { |
314 | op = creator->insert (op); |
271 | op = creator->insert (op); |
315 | |
272 | |
316 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
273 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
317 | monster_check_apply (creator, op); |
274 | monster_check_apply (creator, op); |
318 | |
275 | |
319 | if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) |
276 | if (flags & GT_UPDATE_INV) |
|
|
277 | if (object *tmp = creator->in_player ()) |
320 | esrv_send_item (tmp, op); |
278 | esrv_send_item (tmp, op); |
321 | } |
279 | } |
322 | } |
280 | } |
323 | |
281 | |
324 | /* if there are change_xxx commands in the treasure, we include the changes |
282 | /* if there are change_xxx commands in the treasure, we include the changes |
325 | * in the generated object |
283 | * in the generated object |
… | |
… | |
347 | if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) |
305 | if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) |
348 | { |
306 | { |
349 | if (t->name) |
307 | if (t->name) |
350 | { |
308 | { |
351 | if (difficulty >= t->magic) |
309 | if (difficulty >= t->magic) |
|
|
310 | if (treasurelist *tl = treasurelist::find (t->name)) |
352 | create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries); |
311 | create_treasure (tl, op, flag, difficulty, tries); |
|
|
312 | else |
|
|
313 | LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); |
353 | } |
314 | } |
354 | else |
315 | else |
355 | { |
316 | { |
356 | if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) |
317 | if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE))) |
357 | { |
318 | { |
358 | object *tmp = arch_to_object (t->item); |
319 | object *tmp = arch_to_object (t->item); |
359 | |
320 | |
360 | if (t->nrof && tmp->nrof <= 1) |
321 | if (t->nrof && tmp->nrof <= 1) |
361 | tmp->nrof = rndm (t->nrof) + 1; |
322 | tmp->nrof = rndm (t->nrof) + 1; |
… | |
… | |
408 | create_treasure (tl, op, flag, difficulty, tries); |
369 | create_treasure (tl, op, flag, difficulty, tries); |
409 | } |
370 | } |
410 | else if (t->nrof) |
371 | else if (t->nrof) |
411 | create_one_treasure (tl, op, flag, difficulty, tries); |
372 | create_one_treasure (tl, op, flag, difficulty, tries); |
412 | } |
373 | } |
413 | else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) |
374 | else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE)) |
414 | { |
375 | { |
415 | if (object *tmp = arch_to_object (t->item)) |
376 | if (object *tmp = arch_to_object (t->item)) |
416 | { |
377 | { |
417 | if (t->nrof && tmp->nrof <= 1) |
378 | if (t->nrof && tmp->nrof <= 1) |
418 | tmp->nrof = rndm (t->nrof) + 1; |
379 | tmp->nrof = rndm (t->nrof) + 1; |
… | |
… | |
420 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
381 | fix_generated_item (tmp, op, difficulty, t->magic, flag); |
421 | change_treasure (t, tmp); |
382 | change_treasure (t, tmp); |
422 | put_treasure (tmp, op, flag); |
383 | put_treasure (tmp, op, flag); |
423 | } |
384 | } |
424 | } |
385 | } |
|
|
386 | } |
|
|
387 | |
|
|
388 | void |
|
|
389 | object::create_treasure (treasurelist *tl, int flags) |
|
|
390 | { |
|
|
391 | ::create_treasure (tl, this, flags, map ? map->difficulty : 0); |
425 | } |
392 | } |
426 | |
393 | |
427 | /* This calls the appropriate treasure creation function. tries is passed |
394 | /* This calls the appropriate treasure creation function. tries is passed |
428 | * to determine how many list transitions or attempts to create treasure |
395 | * to determine how many list transitions or attempts to create treasure |
429 | * have been made. It is really in place to prevent infinite loops with |
396 | * have been made. It is really in place to prevent infinite loops with |
… | |
… | |
442 | { |
409 | { |
443 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
410 | LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); |
444 | return; |
411 | return; |
445 | } |
412 | } |
446 | |
413 | |
|
|
414 | if (op->flag [FLAG_TREASURE_ENV]) |
|
|
415 | { |
|
|
416 | // do not generate items when there already is something above the object |
|
|
417 | if (op->flag [FLAG_IS_FLOOR] && op->above) |
|
|
418 | return; |
|
|
419 | |
|
|
420 | flag |= GT_ENVIRONMENT; |
|
|
421 | } |
|
|
422 | |
447 | if (tl->total_chance) |
423 | if (tl->total_chance) |
448 | create_one_treasure (tl, op, flag, difficulty, tries); |
424 | create_one_treasure (tl, op, flag, difficulty, tries); |
449 | else |
425 | else |
450 | create_all_treasures (tl->items, op, flag, difficulty, tries); |
426 | create_all_treasures (tl->items, op, flag, difficulty, tries); |
451 | } |
427 | } |
… | |
… | |
458 | object * |
434 | object * |
459 | generate_treasure (treasurelist *tl, int difficulty) |
435 | generate_treasure (treasurelist *tl, int difficulty) |
460 | { |
436 | { |
461 | difficulty = clamp (difficulty, 1, settings.max_level); |
437 | difficulty = clamp (difficulty, 1, settings.max_level); |
462 | |
438 | |
463 | object *ob = object::create (), *tmp; |
439 | object *ob = object::create (); |
464 | |
440 | |
465 | create_treasure (tl, ob, 0, difficulty, 0); |
441 | create_treasure (tl, ob, 0, difficulty, 0); |
466 | |
442 | |
467 | /* Don't want to free the object we are about to return */ |
443 | /* Don't want to free the object we are about to return */ |
468 | tmp = ob->inv; |
444 | object *tmp = ob->inv; |
469 | if (tmp != NULL) |
445 | if (tmp) |
470 | tmp->remove (); |
446 | tmp->remove (); |
471 | |
447 | |
472 | if (ob->inv) |
448 | if (ob->inv) |
473 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
449 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
474 | |
450 | |
… | |
… | |
482 | * The array has two arguments, the difficulty of the level, and the |
458 | * The array has two arguments, the difficulty of the level, and the |
483 | * magical bonus "wanted". |
459 | * magical bonus "wanted". |
484 | */ |
460 | */ |
485 | |
461 | |
486 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
462 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
487 | |
|
|
488 | // chance of magic difficulty |
463 | // chance of magic difficulty |
489 | // +0 +1 +2 +3 +4 |
464 | // +0 +1 +2 +3 +4 |
490 | {95, 2, 2, 1, 0}, // 1 |
465 | {95, 2, 2, 1, 0}, // 1 |
491 | {92, 5, 2, 1, 0}, // 2 |
466 | {92, 5, 2, 1, 0}, // 2 |
492 | {85, 10, 4, 1, 0}, // 3 |
467 | {85, 10, 4, 1, 0}, // 3 |
… | |
… | |
518 | { 0, 0, 0, 3, 97}, // 29 |
493 | { 0, 0, 0, 3, 97}, // 29 |
519 | { 0, 0, 0, 0, 100}, // 30 |
494 | { 0, 0, 0, 0, 100}, // 30 |
520 | { 0, 0, 0, 0, 100}, // 31 |
495 | { 0, 0, 0, 0, 100}, // 31 |
521 | }; |
496 | }; |
522 | |
497 | |
523 | |
|
|
524 | /* calculate the appropriate level for wands staves and scrolls. |
498 | /* calculate the appropriate level for wands staves and scrolls. |
525 | * This code presumes that op has had its spell object created (in op->inv) |
499 | * This code presumes that op has had its spell object created (in op->inv) |
526 | * |
500 | * |
527 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
501 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
528 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
502 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
529 | */ |
503 | */ |
530 | |
|
|
531 | int |
504 | int |
532 | level_for_item (const object *op, int difficulty) |
505 | level_for_item (const object *op, int difficulty) |
533 | { |
506 | { |
534 | int olevel = 0; |
|
|
535 | |
|
|
536 | if (!op->inv) |
507 | if (!op->inv) |
537 | { |
508 | { |
538 | LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); |
509 | LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); |
539 | return 0; |
510 | return 0; |
540 | } |
511 | } |
541 | |
512 | |
542 | olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); |
513 | int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.)); |
543 | |
514 | |
544 | if (olevel <= 0) |
515 | if (olevel <= 0) |
545 | olevel = rndm (1, MIN (op->inv->level, 1)); |
516 | olevel = rndm (1, op->inv->level); |
546 | |
517 | |
547 | if (olevel > MAXLEVEL) |
518 | return min (olevel, MAXLEVEL); |
548 | olevel = MAXLEVEL; |
|
|
549 | |
|
|
550 | return olevel; |
|
|
551 | } |
519 | } |
552 | |
520 | |
553 | /* |
521 | /* |
554 | * Based upon the specified difficulty and upon the difftomagic_list array, |
522 | * Based upon the specified difficulty and upon the difftomagic_list array, |
555 | * a random magical bonus is returned. This is used when determine |
523 | * a random magical bonus is returned. This is used when determine |
… | |
… | |
611 | |
579 | |
612 | op->magic = magic; |
580 | op->magic = magic; |
613 | if (op->arch) |
581 | if (op->arch) |
614 | { |
582 | { |
615 | if (op->type == ARMOUR) |
583 | if (op->type == ARMOUR) |
616 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; |
584 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100; |
617 | |
585 | |
618 | if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ |
586 | if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ |
619 | magic = (-magic); |
587 | magic = (-magic); |
620 | op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; |
588 | op->weight = (op->arch->weight * (100 - magic * 10)) / 100; |
621 | } |
589 | } |
622 | else |
590 | else |
623 | { |
591 | { |
624 | if (op->type == ARMOUR) |
592 | if (op->type == ARMOUR) |
625 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; |
593 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; |
… | |
… | |
687 | case 2: |
655 | case 2: |
688 | case 3: |
656 | case 3: |
689 | case 4: |
657 | case 4: |
690 | case 5: |
658 | case 5: |
691 | case 6: |
659 | case 6: |
692 | set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); |
660 | op->stats.stat (r) += bonus; |
693 | break; |
661 | break; |
694 | |
662 | |
695 | case 7: |
663 | case 7: |
696 | op->stats.dam += bonus; |
664 | op->stats.dam += bonus; |
697 | break; |
665 | break; |
… | |
… | |
845 | save_item_power = op->item_power; |
813 | save_item_power = op->item_power; |
846 | op->item_power = 0; |
814 | op->item_power = 0; |
847 | |
815 | |
848 | if (op->randomitems && op->type != SPELL) |
816 | if (op->randomitems && op->type != SPELL) |
849 | { |
817 | { |
850 | create_treasure (op->randomitems, op, flags, difficulty, 0); |
818 | 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->debug_desc ()); |
|
|
853 | |
|
|
854 | /* So the treasure doesn't get created again */ |
819 | /* So the treasure doesn't get created again */ |
855 | op->randomitems = 0; |
820 | op->randomitems = 0; |
856 | } |
821 | } |
857 | |
822 | |
858 | if (difficulty < 1) |
823 | if (difficulty < 1) |
… | |
… | |
864 | ARG_INT (flags))) |
829 | ARG_INT (flags))) |
865 | return; |
830 | return; |
866 | |
831 | |
867 | if (!(flags & GT_MINIMAL)) |
832 | if (!(flags & GT_MINIMAL)) |
868 | { |
833 | { |
869 | if (op->arch == crown_arch) |
834 | if (IS_ARCH (op->arch, crown)) |
870 | { |
835 | { |
871 | set_magic (difficulty, op, max_magic, flags); |
836 | set_magic (difficulty, op, max_magic, flags); |
872 | num_enchantments = calc_item_power (op, 1); |
837 | num_enchantments = calc_item_power (op, 1); |
873 | generate_artifact (op, difficulty); |
838 | generate_artifact (op, difficulty); |
874 | } |
839 | } |
… | |
… | |
879 | |
844 | |
880 | num_enchantments = calc_item_power (op, 1); |
845 | num_enchantments = calc_item_power (op, 1); |
881 | |
846 | |
882 | if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) |
847 | if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) |
883 | || op->type == HORN |
848 | || op->type == HORN |
884 | || difficulty >= settings.max_level) /* high difficulties always generate an artifact, |
849 | || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */ |
885 | * used for shop_floors or treasures */ |
|
|
886 | generate_artifact (op, difficulty); |
850 | generate_artifact (op, difficulty); |
887 | } |
851 | } |
888 | |
852 | |
889 | /* Object was made an artifact. Calculate its item_power rating. |
853 | /* Object was made an artifact. Calculate its item_power rating. |
890 | * the item_power in the object is what the artfiact adds. |
854 | * the item_power in the object is what the artfiact adds. |
… | |
… | |
932 | { |
896 | { |
933 | if (op->type == POTION) |
897 | if (op->type == POTION) |
934 | /* Handle healing and magic power potions */ |
898 | /* Handle healing and magic power potions */ |
935 | if (op->stats.sp && !op->randomitems) |
899 | if (op->stats.sp && !op->randomitems) |
936 | { |
900 | { |
937 | object *tmp; |
|
|
938 | |
|
|
939 | tmp = get_archetype (spell_mapping[op->stats.sp]); |
901 | object *tmp = get_archetype (spell_mapping [op->stats.sp]); |
940 | insert_ob_in_ob (tmp, op); |
902 | insert_ob_in_ob (tmp, op); |
941 | op->stats.sp = 0; |
903 | op->stats.sp = 0; |
942 | } |
904 | } |
943 | } |
905 | } |
944 | else if (!op->title) /* Only modify object if not special */ |
906 | else if (!op->title) /* Only modify object if not special */ |
… | |
… | |
1002 | SET_FLAG (op, FLAG_CURSED); |
964 | SET_FLAG (op, FLAG_CURSED); |
1003 | break; |
965 | break; |
1004 | } |
966 | } |
1005 | |
967 | |
1006 | case AMULET: |
968 | case AMULET: |
1007 | if (op->arch == amulet_arch) |
969 | if (IS_ARCH (op->arch, amulet)) |
1008 | op->value *= 5; /* Since it's not just decoration */ |
970 | op->value *= 5; /* Since it's not just decoration */ |
1009 | |
971 | |
1010 | case RING: |
972 | case RING: |
1011 | if (op->arch == NULL) |
973 | if (!op->arch) // wtf? schmorp |
1012 | { |
974 | { |
1013 | op->destroy (); |
975 | op->destroy (); |
1014 | op = 0; |
976 | op = 0; |
1015 | break; |
977 | break; |
1016 | } |
978 | } |
1017 | |
979 | |
1018 | if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ |
980 | if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */ |
1019 | break; |
981 | break; |
1020 | |
982 | |
1021 | if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) |
983 | if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) |
1022 | SET_FLAG (op, FLAG_CURSED); |
984 | SET_FLAG (op, FLAG_CURSED); |
1023 | |
985 | |
… | |
… | |
1176 | * Allocate and return the pointer to an empty artifactlist structure. |
1138 | * Allocate and return the pointer to an empty artifactlist structure. |
1177 | */ |
1139 | */ |
1178 | static artifactlist * |
1140 | static artifactlist * |
1179 | get_empty_artifactlist (void) |
1141 | get_empty_artifactlist (void) |
1180 | { |
1142 | { |
1181 | return salloc0 <artifactlist> (); |
1143 | return salloc0<artifactlist> (); |
1182 | } |
1144 | } |
1183 | |
1145 | |
1184 | /* |
1146 | /* |
1185 | * Allocate and return the pointer to an empty artifact structure. |
1147 | * Allocate and return the pointer to an empty artifact structure. |
1186 | */ |
1148 | */ |
1187 | static artifact * |
1149 | static artifact * |
1188 | get_empty_artifact (void) |
1150 | get_empty_artifact (void) |
1189 | { |
1151 | { |
1190 | return salloc0 <artifact> (); |
1152 | return salloc0<artifact> (); |
1191 | } |
1153 | } |
1192 | |
1154 | |
1193 | /* |
1155 | /* |
1194 | * Searches the artifact lists and returns one that has the same type |
1156 | * Searches the artifact lists and returns one that has the same type |
1195 | * of objects on it. |
1157 | * of objects on it. |
… | |
… | |
1200 | for (artifactlist *al = first_artifactlist; al; al = al->next) |
1162 | for (artifactlist *al = first_artifactlist; al; al = al->next) |
1201 | if (al->type == type) |
1163 | if (al->type == type) |
1202 | return al; |
1164 | return al; |
1203 | |
1165 | |
1204 | return 0; |
1166 | return 0; |
1205 | } |
|
|
1206 | |
|
|
1207 | /* |
|
|
1208 | * For debugging purposes. Dumps all tables. |
|
|
1209 | */ |
|
|
1210 | void |
|
|
1211 | dump_artifacts (void) |
|
|
1212 | { |
|
|
1213 | artifactlist *al; |
|
|
1214 | artifact *art; |
|
|
1215 | linked_char *next; |
|
|
1216 | |
|
|
1217 | fprintf (logfile, "\n"); |
|
|
1218 | for (al = first_artifactlist; al != NULL; al = al->next) |
|
|
1219 | { |
|
|
1220 | fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance); |
|
|
1221 | for (art = al->items; art != NULL; art = art->next) |
|
|
1222 | { |
|
|
1223 | fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); |
|
|
1224 | if (art->allowed != NULL) |
|
|
1225 | { |
|
|
1226 | fprintf (logfile, "\tallowed combinations:"); |
|
|
1227 | for (next = art->allowed; next != NULL; next = next->next) |
|
|
1228 | fprintf (logfile, "%s,", &next->name); |
|
|
1229 | fprintf (logfile, "\n"); |
|
|
1230 | } |
|
|
1231 | } |
|
|
1232 | } |
|
|
1233 | fprintf (logfile, "\n"); |
|
|
1234 | } |
|
|
1235 | |
|
|
1236 | /* |
|
|
1237 | * For debugging purposes. Dumps all treasures recursively (see below). |
|
|
1238 | */ |
|
|
1239 | void |
|
|
1240 | dump_monster_treasure_rec (const char *name, treasure *t, int depth) |
|
|
1241 | { |
|
|
1242 | treasurelist *tl; |
|
|
1243 | int i; |
|
|
1244 | |
|
|
1245 | if (depth > 100) |
|
|
1246 | return; |
|
|
1247 | |
|
|
1248 | while (t) |
|
|
1249 | { |
|
|
1250 | if (t->name) |
|
|
1251 | { |
|
|
1252 | for (i = 0; i < depth; i++) |
|
|
1253 | fprintf (logfile, " "); |
|
|
1254 | |
|
|
1255 | fprintf (logfile, "{ (list: %s)\n", &t->name); |
|
|
1256 | |
|
|
1257 | tl = treasurelist::find (t->name); |
|
|
1258 | if (tl) |
|
|
1259 | dump_monster_treasure_rec (name, tl->items, depth + 2); |
|
|
1260 | |
|
|
1261 | for (i = 0; i < depth; i++) |
|
|
1262 | fprintf (logfile, " "); |
|
|
1263 | |
|
|
1264 | fprintf (logfile, "} (end of list: %s)\n", &t->name); |
|
|
1265 | } |
|
|
1266 | else |
|
|
1267 | { |
|
|
1268 | for (i = 0; i < depth; i++) |
|
|
1269 | fprintf (logfile, " "); |
|
|
1270 | |
|
|
1271 | if (t->item && t->item->clone.type == FLESH) |
|
|
1272 | fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); |
|
|
1273 | else |
|
|
1274 | fprintf (logfile, "%s\n", &t->item->clone.name); |
|
|
1275 | } |
|
|
1276 | |
|
|
1277 | if (t->next_yes) |
|
|
1278 | { |
|
|
1279 | for (i = 0; i < depth; i++) |
|
|
1280 | fprintf (logfile, " "); |
|
|
1281 | |
|
|
1282 | fprintf (logfile, " (if yes)\n"); |
|
|
1283 | dump_monster_treasure_rec (name, t->next_yes, depth + 1); |
|
|
1284 | } |
|
|
1285 | |
|
|
1286 | if (t->next_no) |
|
|
1287 | { |
|
|
1288 | for (i = 0; i < depth; i++) |
|
|
1289 | fprintf (logfile, " "); |
|
|
1290 | |
|
|
1291 | fprintf (logfile, " (if no)\n"); |
|
|
1292 | dump_monster_treasure_rec (name, t->next_no, depth + 1); |
|
|
1293 | } |
|
|
1294 | |
|
|
1295 | t = t->next; |
|
|
1296 | } |
|
|
1297 | } |
|
|
1298 | |
|
|
1299 | /* |
|
|
1300 | * For debugging purposes. Dumps all treasures for a given monster. |
|
|
1301 | * Created originally by Raphael Quinet for debugging the alchemy code. |
|
|
1302 | */ |
|
|
1303 | void |
|
|
1304 | dump_monster_treasure (const char *name) |
|
|
1305 | { |
|
|
1306 | archetype *at; |
|
|
1307 | int found; |
|
|
1308 | |
|
|
1309 | found = 0; |
|
|
1310 | fprintf (logfile, "\n"); |
|
|
1311 | |
|
|
1312 | for (at = first_archetype; at != NULL; at = at->next) |
|
|
1313 | if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) |
|
|
1314 | { |
|
|
1315 | fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); |
|
|
1316 | if (at->clone.randomitems != NULL) |
|
|
1317 | dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); |
|
|
1318 | else |
|
|
1319 | fprintf (logfile, "(nothing)\n"); |
|
|
1320 | |
|
|
1321 | fprintf (logfile, "\n"); |
|
|
1322 | found++; |
|
|
1323 | } |
|
|
1324 | |
|
|
1325 | if (found == 0) |
|
|
1326 | fprintf (logfile, "No objects have the name %s!\n\n", name); |
|
|
1327 | } |
1167 | } |
1328 | |
1168 | |
1329 | /* |
1169 | /* |
1330 | * Builds up the lists of artifacts from the file in the libdir. |
1170 | * Builds up the lists of artifacts from the file in the libdir. |
1331 | */ |
1171 | */ |
… | |
… | |
1346 | object_thawer f (filename); |
1186 | object_thawer f (filename); |
1347 | |
1187 | |
1348 | if (!f) |
1188 | if (!f) |
1349 | return; |
1189 | return; |
1350 | |
1190 | |
1351 | f.next (); |
|
|
1352 | |
|
|
1353 | for (;;) |
1191 | for (;;) |
1354 | { |
1192 | { |
1355 | switch (f.kw) |
1193 | switch (f.kw) |
1356 | { |
1194 | { |
1357 | case KW_allowed: |
1195 | case KW_allowed: |
1358 | if (!art) |
1196 | if (!art) |
1359 | { |
|
|
1360 | art = get_empty_artifact (); |
1197 | art = get_empty_artifact (); |
1361 | nrofartifacts++; |
|
|
1362 | } |
|
|
1363 | |
1198 | |
1364 | { |
1199 | { |
1365 | if (!strcmp (f.get_str (), "all")) |
1200 | if (!strcmp (f.get_str (), "all")) |
1366 | break; |
1201 | break; |
1367 | |
1202 | |
1368 | char *next, *cp = f.get_str (); |
1203 | char *next, *cp = f.get_str (); |
1369 | |
1204 | |
1370 | do |
1205 | do |
1371 | { |
1206 | { |
1372 | nrofallowedstr++; |
|
|
1373 | |
|
|
1374 | if ((next = strchr (cp, ','))) |
1207 | if ((next = strchr (cp, ','))) |
1375 | *next++ = '\0'; |
1208 | *next++ = '\0'; |
1376 | |
1209 | |
1377 | linked_char *tmp = new linked_char; |
1210 | linked_char *tmp = new linked_char; |
1378 | |
1211 | |
… | |
… | |
1393 | break; |
1226 | break; |
1394 | |
1227 | |
1395 | case KW_object: |
1228 | case KW_object: |
1396 | { |
1229 | { |
1397 | art->item = object::create (); |
1230 | art->item = object::create (); |
|
|
1231 | f.get (art->item->name); |
|
|
1232 | f.next (); |
1398 | |
1233 | |
1399 | if (!art->item->parse_kv (f)) |
1234 | if (!art->item->parse_kv (f)) |
1400 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
1235 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
1401 | |
1236 | |
1402 | al = find_artifactlist (art->item->type); |
1237 | al = find_artifactlist (art->item->type); |
… | |
… | |
1428 | } |
1263 | } |
1429 | |
1264 | |
1430 | done: |
1265 | done: |
1431 | for (al = first_artifactlist; al; al = al->next) |
1266 | for (al = first_artifactlist; al; al = al->next) |
1432 | { |
1267 | { |
|
|
1268 | al->total_chance = 0; |
|
|
1269 | |
1433 | for (art = al->items; art; art = art->next) |
1270 | for (art = al->items; art; art = art->next) |
1434 | { |
1271 | { |
1435 | if (!art->chance) |
1272 | if (!art->chance) |
1436 | LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); |
1273 | LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); |
1437 | else |
1274 | else |
… | |
… | |
1443 | } |
1280 | } |
1444 | |
1281 | |
1445 | LOG (llevDebug, "done.\n"); |
1282 | LOG (llevDebug, "done.\n"); |
1446 | } |
1283 | } |
1447 | |
1284 | |
1448 | |
|
|
1449 | /* |
1285 | /* |
1450 | * Used in artifact generation. The bonuses of the first object |
1286 | * Used in artifact generation. The bonuses of the first object |
1451 | * is modified by the bonuses of the second object. |
1287 | * is modified by the bonuses of the second object. |
1452 | */ |
1288 | */ |
1453 | |
|
|
1454 | void |
1289 | void |
1455 | add_abilities (object *op, object *change) |
1290 | add_abilities (object *op, object *change) |
1456 | { |
1291 | { |
1457 | int i, tmp; |
1292 | int i, tmp; |
1458 | |
1293 | |
… | |
… | |
1463 | #endif |
1298 | #endif |
1464 | op->face = change->face; |
1299 | op->face = change->face; |
1465 | } |
1300 | } |
1466 | |
1301 | |
1467 | for (i = 0; i < NUM_STATS; i++) |
1302 | for (i = 0; i < NUM_STATS; i++) |
1468 | change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); |
1303 | change_attr_value (&(op->stats), i, change->stats.stat (i)); |
1469 | |
1304 | |
1470 | op->attacktype |= change->attacktype; |
1305 | op->attacktype |= change->attacktype; |
1471 | op->path_attuned |= change->path_attuned; |
1306 | op->path_attuned |= change->path_attuned; |
1472 | op->path_repelled |= change->path_repelled; |
1307 | op->path_repelled |= change->path_repelled; |
1473 | op->path_denied |= change->path_denied; |
1308 | op->path_denied |= change->path_denied; |
… | |
… | |
1637 | if (change->msg) |
1472 | if (change->msg) |
1638 | op->msg = change->msg; |
1473 | op->msg = change->msg; |
1639 | } |
1474 | } |
1640 | |
1475 | |
1641 | static int |
1476 | static int |
1642 | legal_artifact_combination (object *op, artifact * art) |
1477 | legal_artifact_combination (object *op, artifact *art) |
1643 | { |
1478 | { |
1644 | int neg, success = 0; |
1479 | int neg, success = 0; |
1645 | linked_char *tmp; |
1480 | linked_char *tmp; |
1646 | const char *name; |
1481 | const char *name; |
1647 | |
1482 | |
1648 | if (art->allowed == (linked_char *) NULL) |
1483 | if (!art->allowed) |
1649 | return 1; /* Ie, "all" */ |
1484 | return 1; /* Ie, "all" */ |
|
|
1485 | |
1650 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1486 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1651 | { |
1487 | { |
1652 | #ifdef TREASURE_VERBOSE |
1488 | #ifdef TREASURE_VERBOSE |
1653 | LOG (llevDebug, "legal_art: %s\n", &tmp->name); |
1489 | LOG (llevDebug, "legal_art: %s\n", &tmp->name); |
1654 | #endif |
1490 | #endif |
… | |
… | |
1656 | name = tmp->name + 1, neg = 1; |
1492 | name = tmp->name + 1, neg = 1; |
1657 | else |
1493 | else |
1658 | name = tmp->name, neg = 0; |
1494 | name = tmp->name, neg = 0; |
1659 | |
1495 | |
1660 | /* If we match name, then return the opposite of 'neg' */ |
1496 | /* If we match name, then return the opposite of 'neg' */ |
1661 | if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) |
1497 | if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname))) |
1662 | return !neg; |
1498 | return !neg; |
1663 | |
1499 | |
1664 | /* Set success as true, since if the match was an inverse, it means |
1500 | /* Set success as true, since if the match was an inverse, it means |
1665 | * everything is allowed except what we match |
1501 | * everything is allowed except what we match |
1666 | */ |
1502 | */ |
1667 | else if (neg) |
1503 | else if (neg) |
1668 | success = 1; |
1504 | success = 1; |
1669 | } |
1505 | } |
|
|
1506 | |
1670 | return success; |
1507 | return success; |
1671 | } |
1508 | } |
1672 | |
1509 | |
1673 | /* |
1510 | /* |
1674 | * Fixes the given object, giving it the abilities and titles |
1511 | * Fixes the given object, giving it the abilities and titles |
… | |
… | |
1811 | SET_FLAG (item, FLAG_NO_STEAL); |
1648 | SET_FLAG (item, FLAG_NO_STEAL); |
1812 | } |
1649 | } |
1813 | } |
1650 | } |
1814 | |
1651 | |
1815 | /* special_potion() - so that old potion code is still done right. */ |
1652 | /* special_potion() - so that old potion code is still done right. */ |
1816 | |
|
|
1817 | int |
1653 | int |
1818 | special_potion (object *op) |
1654 | special_potion (object *op) |
1819 | { |
1655 | { |
1820 | if (op->attacktype) |
1656 | if (op->attacktype) |
1821 | return 1; |
1657 | return 1; |