Updates to combat system

ugh json reading is annoying