… | |
… | |
214 | { |
214 | { |
215 | destroy = 0; |
215 | destroy = 0; |
216 | otmp = op->above; |
216 | otmp = op->above; |
217 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
217 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
218 | break; |
218 | break; |
219 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) || |
219 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) |
220 | QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) || |
220 | || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) |
221 | QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) || |
221 | || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) |
222 | QUERY_FLAG (op, FLAG_UNIQUE) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) || QUERY_FLAG (op, FLAG_UNPAID) || IS_LIVE (op)) |
222 | || QUERY_FLAG (op, FLAG_UNIQUE) |
|
|
223 | || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) |
|
|
224 | || QUERY_FLAG (op, FLAG_UNPAID) |
|
|
225 | || op->is_alive ()) |
223 | continue; |
226 | continue; |
|
|
227 | |
224 | /* otherwise, we decay and destroy */ |
228 | /* otherwise, we decay and destroy */ |
225 | if (IS_WEAPON (op)) |
229 | if (op->is_weapon ()) |
226 | { |
230 | { |
227 | op->stats.dam--; |
231 | op->stats.dam--; |
228 | if (op->stats.dam < 0) |
232 | if (op->stats.dam < 0) |
229 | destroy = 1; |
233 | destroy = 1; |
230 | } |
234 | } |
231 | else if (IS_ARMOR (op)) |
235 | else if (op->is_armor ()) |
232 | { |
236 | { |
233 | op->stats.ac--; |
237 | op->stats.ac--; |
234 | if (op->stats.ac < 0) |
238 | if (op->stats.ac < 0) |
235 | destroy = 1; |
239 | destroy = 1; |
236 | } |
240 | } |
… | |
… | |
295 | return; |
299 | return; |
296 | |
300 | |
297 | if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) |
301 | if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) |
298 | return; |
302 | return; |
299 | |
303 | |
300 | if (!IS_ARMOR (op)) |
304 | if (!op->is_armor ()) |
301 | return; |
305 | return; |
302 | |
306 | |
303 | mt = name_to_material (op->materialname); |
307 | mt = name_to_material (op->materialname); |
304 | if (!mt) |
308 | if (!mt) |
305 | { |
309 | { |
… | |
… | |
351 | { |
355 | { |
352 | if (op->material & mt->material && rndm (1, 100) <= mt->chance && |
356 | if (op->material & mt->material && rndm (1, 100) <= mt->chance && |
353 | difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) |
357 | difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) |
354 | { |
358 | { |
355 | lmt = mt; |
359 | lmt = mt; |
356 | if (!(IS_WEAPON (op) || IS_ARMOR (op))) |
360 | if (!(op->is_weapon () || op->is_armor ())) |
357 | break; |
361 | break; |
358 | } |
362 | } |
359 | } |
363 | } |
360 | #endif |
364 | #endif |
361 | } |
365 | } |
… | |
… | |
369 | #ifndef NEW_MATERIAL_CODE |
373 | #ifndef NEW_MATERIAL_CODE |
370 | op->materialname = lmt->name; |
374 | op->materialname = lmt->name; |
371 | return; |
375 | return; |
372 | #else |
376 | #else |
373 | |
377 | |
374 | if (op->stats.dam && IS_WEAPON (op)) |
378 | if (op->stats.dam && op->is_weapon ()) |
375 | { |
379 | { |
376 | op->stats.dam += lmt->damage; |
380 | op->stats.dam += lmt->damage; |
377 | if (op->stats.dam < 1) |
381 | if (op->stats.dam < 1) |
378 | op->stats.dam = 1; |
382 | op->stats.dam = 1; |
379 | } |
383 | } |
380 | if (op->stats.sp && op->type == BOW) |
384 | if (op->stats.sp && op->type == BOW) |
381 | op->stats.sp += lmt->sp; |
385 | op->stats.sp += lmt->sp; |
382 | if (op->stats.wc && IS_WEAPON (op)) |
386 | if (op->stats.wc && op->is_weapon ()) |
383 | op->stats.wc += lmt->wc; |
387 | op->stats.wc += lmt->wc; |
384 | if (IS_ARMOR (op)) |
388 | if (op->is_armor ()) |
385 | { |
389 | { |
386 | if (op->stats.ac) |
390 | if (op->stats.ac) |
387 | op->stats.ac += lmt->ac; |
391 | op->stats.ac += lmt->ac; |
388 | for (j = 0; j < NROFATTACKS; j++) |
392 | for (j = 0; j < NROFATTACKS; j++) |
389 | if (op->resist[j] != 0) |
393 | if (op->resist[j] != 0) |
… | |
… | |
395 | op->resist[j] = -100; |
399 | op->resist[j] = -100; |
396 | } |
400 | } |
397 | } |
401 | } |
398 | op->materialname = add_string (lmt->name); |
402 | op->materialname = add_string (lmt->name); |
399 | /* dont make it unstackable if it doesn't need to be */ |
403 | /* dont make it unstackable if it doesn't need to be */ |
400 | if (IS_WEAPON (op) || IS_ARMOR (op)) |
404 | if (op->is_weapon () || op->is_armor ()) |
401 | { |
405 | { |
402 | op->weight = (op->weight * lmt->weight) / 100; |
406 | op->weight = (op->weight * lmt->weight) / 100; |
403 | op->value = (op->value * lmt->value) / 100; |
407 | op->value = (op->value * lmt->value) / 100; |
404 | } |
408 | } |
405 | #endif |
409 | #endif |