Issue with thesocial policies and buildings should be fixed now, and I'm about to upload the patch as I type this.
It fixes the buildings and wonders that were depending on CombatClasses like the Stables and does the same for similar Social Polies. No rewrite of the code needed :)

@EmperorQ I'd have to get a specific list of the buildings/policies that affect (or in this case don't affect) the new classes and try to see if I can't <Update> them to include the added combatclasses as well. As far as I know this is the only true way to get the varying combatclasses in there so a rewrite is probably not going to happen, I CAN see if I can't add support as I mentioned before.

I noticed while playing that buildings or policies that function based on CombatClass (ex. stable) don't affect the new classes

*Update: Skimmed through your code. I see you made new CombatClasses and used Update to assign them to units. Also re-added the standard promotions of the original CombatClass to said units.

But this neglects buildings or policies or anything else that functions on CombatClass.
It also isn't very flexible; any mod that adds something (building, policy, UA, etc.) that uses CombatClass will not apply to the modified units. Is there a way to add a secondary class or a sub-class so you can retain the old class (and its applications) while still having the new features?

(Sorry, I know I'm asking a lot, since you'd have to re-write the entire code)

pushes thumbs down

Never played or even heard of Fire Emblem (wtf is this?), but after playing a severa Civ5 games with FE civs/units/feats I kinda become a fan of it :D

For anyone who has tried to download the mod through the direct link but wasn't able to navigate there: sorry, I had forgotten to actually post a shareable one here! It should work now :)
Next patch will include more balancing and fixes, the Supereffective Update: which integrates Flying/ Armored and Mounted units back into the Triangles is set for the next update, however far that may be. Look forward to it !

Looks good! I'll take a look in a bit. (Also, Thank You!)

Eyyy I got mod support lol