Replace weapon_type with equip_flags

In addition, the Block power now requires an equipped shield to be used.