added weapon support to combat and added properties to distinguish between weapons and ordinary objects