[Mercenaries] Convert Mercenaries to Repositories (#3947)

* [Mercenaries] Convert Mercenaries to Repositories

- Convert all Mercenary methods to repositories aside from inner join queries that cannot be converted.

* Update base_merc_subtypes_repository.h

* Update base_merc_subtypes_repository.h

* Regenerate repositories

zone/npc.cpp

@@ -300,8 +300,8 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
 	m_record_loot_stats  = false;
 
 	if (GetClass() == Class::MercenaryLiaison && RuleB(Mercs, AllowMercs)) {
-		LoadMercTypes();
-		LoadMercs();
+		LoadMercenaryTypes();
+		LoadMercenaries();
 	}
 
 	SpellFocusDMG  = 0;