Shouldn't this be cleaned a bit?

units/kush_camelry_javelinist should be renamed

• either units/kush_cavalry_javelinist_merc as is done for other civs
• or if we don't want others civ to be able to train in these camps, units/kush_cavalry_javelinist_nuba (replace nuba by the civ of these mercenaries if not nubian) as is done in the cart embassies.

and get rid of this camelry unit.

then, as this camp play the same role as the cart embassies, it should inherit from the embassy (may be we could give a better name to this parent template) rather than from the barracks. And both should have a common class (Embassy for cart and MercenaryCamp for kush which play the same role is just a way to complicate things for the ai). And i would rather use this common class as build restriction category.

Okay I'll fix this.

Concerning cleanings, i've also noticed that:

why does this mercenaryCamp have camel prop? that's the only building with such props, and futhermore they really look like camel traders. Every player will try to kill them and report that as a bug. Imo we should remove them.

Why do all mercenaries units be called civ_infantry_javelinist_merc_b except kushites which are named civ_infantry_merc_javelinist_b? That should be changed.

Should I remove the goats as well ?

I would personnaly also remove them (there are no reason to have them on the structure and none others). But i've no strong opinion for goats as there are no ambiguities while camels really look like a enemy trader and you are tempted to try and attack them.

What if I removed one of the camels and the props on his back, so it doesn't look like a trader ?
As suggested by Sundiata a few mins ago https://wildfiregames.com/forum/index.php?/messenger/8895/&page=13

I don't know. If you are sure players won't try to hunt them. As i said, i'd prefer to remove all of them, but have no veto against either choice.

either units/kush_cavalry_javelinist_merc as is done for other civs

@Stan, the reason for this is not the ai, but the template names of other civs. By naming the Blemmye camel kush_cavalry_javelinist_merc*, other civs that have similarly named units (in this case only ptol) can train their cavalry javelinist mercenaries at captured Kushite camps, and vice versa; to all civs that don't have them (all except kush and ptol) those camps are useless.
Another approach is D2536, which makes Blemmye and Nuba mercenaries generic, which means everyone can train these mercenaries at captured Kushite camps.