[z2207] Support non-player conditions

(based on commit [12304] - dbb5018)

(based on commit [s1841] - dc176f3)