Combat Shop

Worked on the combat shop to try to get it fixed