| … | |
… | |
| 599 | |
599 | |
| 600 | // restore original wc, dam, attacktype and slaying |
600 | // restore original wc, dam, attacktype and slaying |
| 601 | op->stats.wc = op->stats.sp; |
601 | op->stats.wc = op->stats.sp; |
| 602 | op->stats.dam = op->stats.hp; |
602 | op->stats.dam = op->stats.hp; |
| 603 | op->attacktype = op->stats.grace; |
603 | op->attacktype = op->stats.grace; |
| 604 | op->slaying = op->spellarg; |
604 | op->slaying = op->custom_name; |
| 605 | |
605 | |
| 606 | /* Reset these to defaults, so that object::can_merge will work properly */ |
606 | /* Reset these to defaults, so that object::can_merge will work properly */ |
| 607 | op->spellarg = 0; |
607 | op->custom_name = 0; |
| 608 | op->stats.sp = 0; |
608 | op->stats.sp = 0; |
| 609 | op->stats.hp = 0; |
609 | op->stats.hp = 0; |
| 610 | op->stats.grace = 0; |
610 | op->stats.grace = 0; |
| 611 | op->level = 0; |
611 | op->level = 0; |
| 612 | op->face = op->arch->face; |
612 | op->face = op->arch->face; |
