added bonus and penalties from ranged attacks
checkin melee lock attempt
updated melee_lock to use set data type