Reworked encounter activity to use EncounterCombatant instead of Combatant