Added conversation tactics and merchant restocking