Tidy layout for CounterFromSelf
Add 'Whenever another <permanent type/subtype> enters the battlefield, <effect>'
Add 'Clockwork' to MagicAtEndOfCombatTrigger
New card scripts