Fixed "City's Blessing" macros, fixed "Jared Carthalion, True Heir", added new keyoword "noncombatvigor" for cards such as "Stormwild Capridor".

projects/mtg/bin/Res/sets/primitives/borderline.txt

@@ -33087,7 +33087,6 @@ type=Artifact
 [/card]
 [card]
 name=Jared Carthalion, True Heir
-abilities=haste
 auto=_MONARCH_OPPONENT_
 auto=emblem transforms((,newability[@becomesmonarchof(player):name(You can't become the monarch) _MONARCH_OPPONENT_])) ueot
 auto=this(variable{pmonarch}>0) vigor
@@ -61324,8 +61323,7 @@ toughness=5
 [/card]
 [card]
 name=Stormwild Capridor
-abilities=flying
-auto=@damaged(this) from(NoncombatDamage):all(trigger[to]) vigor
+abilities=flying,noncombatvigor
 text=Flying -- If noncombat damage would be dealt to Stormwild Capridor, prevent that damage. Put a +1/+1 counter on Stormwild Capridor for each 1 damage prevented this way.
 mana={2}{W}
 type=Creature