Fixes simple_animal Bump() on harm intent

Previously, they'd move twice.
Fixes #3550
Also cleans up some copy-paste in the simple_animal Bump() proc.
Also there was some weird code in Bump() for full-tile windows or some shit, I don't know what it does so I deleted it. Nothing broke so I think it's fine (paprika repathed those anyway so the code wasn't doing anything anyway).