with auto upgrading dice you should be able to take them out early to swap them with another die that needs upgrading but you lose that money for that upgrade that was in progress
Some helpful suggestions for the combat would be 1. make an attack animation for the player and enemy 2. show their damage next to their current health 3. lock gear