refactor stock_room
additional and smarter handling of ettin beheadings