Shop basically works, other fixes

logics for buying items for merchant is there, moved the different logic
between picking up stackable and nonstackable item to player class.