- science from kills is now equal to ranged combat strength if it is greater

- Removed experimental happiness from city combat strength. instead, +2 happiness from Walls from Military Caste.

Change a LOT:

Military Caste - now provides +2 culture from garrisons and also from forts citadels and chataus only if there is a unit stationed there. +1 Happiness per 10X combat strength across all cities where X is the number of Eras that you have been in.

Professional Army - no longer provides culture or happiness from any defense buildings

Military Tradition - gain science from unit kills. Units no longer gain 50% extra xp from combat.

Discipline - barracks, armories, military academies construct 100% faster and +2 food from barracks (moved from military caste)

Finisher - no longer provides free great general or increased spawn rate. +2 culture from Citadels and +1 production from all defensive tile improvements

- Professional Army: +1 Happiness from Walls

- Fixed a bug where you would not earn culture for killing non-barbarian units

The mod is now fully working as intended.