removed save from equipment
removed circumstance from conditions
add label
fully update Combat
resolve merge conflicts
updated PDF