More work on the combat system &proto-souls