Well originally that was my intention, but as I began making the post, I thought that having 8 different uniforms would conflict with the idea of saving space in inventory.

But thinking on it again, having gear suited like that strictly for city-states would deminish it's appeal on the classes as it doesn't make them unique to each. If there was a poll I could make I'd create one asking between the two forms.

Anyway I'll adjust the first post to include both ideas soon.