Some fixes

forge-ai/src/main/java/forge/ai/ability/CountersProliferateAi.java

@@ -28,10 +28,9 @@ public class CountersProliferateAi extends SpellAbilityAi {
     @Override
     protected boolean checkApiLogic(Player ai, SpellAbility sa) {
         final List<Card> cperms = Lists.newArrayList();
-        final List<Player> allies = ai.getYourTeam();
         boolean allyExpOrEnergy = false;
 
-        for (final Player p : allies) {
+        for (final Player p : ai.getYourTeam()) {
         	// player has experience or energy counter
             if (p.getCounters(CounterEnumType.EXPERIENCE) + p.getCounters(CounterEnumType.ENERGY) >= 1) {
                 allyExpOrEnergy = true;
@@ -140,9 +139,16 @@ public class CountersProliferateAi extends SpellAbilityAi {
             if (c.isPlaneswalker()) {
                 if (c.getController().isOpponentOf(ai)) {
                     continue;
-                } else {
+                }
                 return (T)c;
             }
+
+            if (c.isBattle()) {
+                if (c.getProtectingPlayer().isOpponentOf(ai)) {
+                    // TODO in multiplayer we might sometimes want to do it anyway?
+                    continue;
+                }
+                return (T)c;
             }
 
             final Card lki = CardUtil.getLKICopy(c);

forge-game/src/main/java/forge/game/card/Card.java

@@ -1738,6 +1738,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         protectingPlayer = p;
         view.updateProtectingPlayer(this);
     }
+
     public final void setSecretChosenPlayer(final Player p) {
         chosenPlayer = p;
     }

forge-gui/res/cardsfolder/j/jaddi_lifestrider.txt

@@ -2,7 +2,7 @@ Name:Jaddi Lifestrider
 ManaCost:4 G
 Types:Creature Elemental
 PT:2/8
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ GuestList | TriggerDescription$ When CARDNAME enters the battlefield, you may tap any number of untapped creatures you control. You gain 2 life for each creature tapped this way.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigJaddiLifestriderTap | TriggerDescription$ When CARDNAME enters the battlefield, you may tap any number of untapped creatures you control. You gain 2 life for each creature tapped this way.
 SVar:TrigJaddiLifestriderTap:DB$ Tap | CardChoices$ Creature.YouCtrl+untapped | AnyNumber$ True | ChoiceAmount$ Count$Valid Creature.YouCtrl+untapped | RememberTapped$ True | SubAbility$ DBJaddiLifestriderGainLife
 SVar:DBJaddiLifestriderGainLife:DB$ GainLife | LifeAmount$ JaddiLifestriderZ | SubAbility$ DBJaddiLifestriderCleanup
 SVar:DBJaddiLifestriderCleanup:DB$ Cleanup | ClearRemembered$ True

forge-gui/res/cardsfolder/s/siege_striker.txt

@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Soldier
 PT:1/1
 K:Double Strike
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap any number of untapped creatures you control. CARDNAME gets +1/+1 until end of turn for each creature tapped this way.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap any number of untapped creatures you control. CARDNAME gets +1/+1 until end of turn for each creature tapped this way.
 SVar:TrigTap:DB$ Tap | CardChoices$ Creature.YouCtrl+untapped | AnyNumber$ True | ChoiceAmount$ Count$Valid Creature.YouCtrl+untapped | RememberTapped$ True | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Self | NumAtt$ Y | NumDef$ Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

forge-gui/res/cardsfolder/upcoming/elenda_and_azor.txt

@@ -8,7 +8,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$
 SVar:TrigDraw:AB$ Draw | Cost$ X W U U | NumCards$ X
 SVar:X:Count$xPaid
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, you may pay 4 life. If you do, create a number of 1/1 black Vampire Knight creature tokens with lifelink equal to the number of cards you've drawn this turn.
-SVar:TrigToken:AB$ Token | Cost$ PayLife<4> | TokenAmount$ Y | TokenScript$ w_1_1_vampire_lifelink | TokenOwner$ You
+SVar:TrigToken:AB$ Token | Cost$ PayLife<4> | TokenAmount$ Y | TokenScript$ w_1_1_vampire_knight_lifelink | TokenOwner$ You
 SVar:Y:Count$YouDrewThisTurn
 DeckHas:Ability$Token|LifeGain
 SVar:HasAttackEffect:TRUE

forge-gui/res/cardsfolder/upcoming/progenitor_exarch.txt

@@ -3,8 +3,9 @@ ManaCost:X X W
 Types:Creature Phyrexian Cat Cleric
 PT:1/2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigIncubate | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters the battlefield, incubate 3 X times. (To incubate 3, create an Incubator token with three +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
-SVar:TrigIncubate:DB$ Incubate | Amount$ 3 | Times$ Count$xPaid
+SVar:TrigIncubate:DB$ Incubate | Amount$ 3 | Times$ X
 A:AB$ SetState | Cost$ T | TgtPrompt$ Select target Incubator token you control | ValidTgts$ Incubator.token+YouCtrl | Mode$ Transform | SpellDescription$ Transform target Incubator token you control.
+SVar:X:Count$xPaid
 DeckHints:Type$Incubator
 DeckHas:Ability$Token|Counters & Type$Artifact|Incubator
 Oracle:When Progenitor Exarch enters the battlefield, incubate 3 X times. (To incubate 3, create an Incubator token with three +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)\n{T}: Transform target Incubator token you control.

forge-gui/res/tokenscripts/w_1_1_vampire_knight_lifelink.txt

@@ -1,6 +1,6 @@
-Name:Vampire Token
+Name:Vampire Knight Token
 ManaCost:no cost
-Types:Creature Vampire
+Types:Creature Knight Vampire
 Colors:white
 PT:1/1
 K:Lifelink