| … | |
… | |
| 522 | * playability reasons. |
522 | * playability reasons. |
| 523 | */ |
523 | */ |
| 524 | if (tmp->arch == op->arch |
524 | if (tmp->arch == op->arch |
| 525 | && tmp->type == op->type |
525 | && tmp->type == op->type |
| 526 | && tmp->subtype == op->subtype |
526 | && tmp->subtype == op->subtype |
|
|
527 | && tmp->owner == op->owner |
| 527 | && tmp->owner == op->owner && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) |
528 | && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) |
| 528 | { |
529 | { |
| 529 | tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); |
530 | tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); |
| 530 | tmp->range = MAX (tmp->range, op->range); |
531 | tmp->range = MAX (tmp->range, op->range); |
| 531 | tmp->duration = MAX (tmp->duration, op->duration); |
532 | tmp->duration = MAX (tmp->duration, op->duration); |
| 532 | return 0; |
533 | return 0; |
