Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring

forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java

@@ -2449,7 +2449,7 @@ public class ComputerUtilCombat {
         for (final ReplacementEffect re : list) {
             Map<String, String> params = re.getMapParams();
             if (params.containsKey("Prevent") ||
-                    (re.getOverridingAbility() != null && re.getOverridingAbility().getApi() != ApiType.ReplaceDamage)) {
+                    (re.getOverridingAbility() != null && re.getOverridingAbility().getApi() != ApiType.ReplaceDamage && re.getOverridingAbility().getApi() != ApiType.ReplaceEffect)) {
                 return true;
             }
         }

forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java

@@ -110,6 +110,10 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect {
             removeEnchantmentTypes = true;
         }
 
+        if (sa.hasParam("RememberAnimated")) {
+            source.addRemembered(c);
+        }
+
         if ((power != null) || (toughness != null)) {
             c.addNewPT(power, toughness, timestamp);
         }

forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java

@@ -80,13 +80,17 @@ public class TriggerSacrificed extends Trigger {
 
             // When cast with Emerge, the cost instance is there
             IndividualCostPaymentInstance currentPayment = (IndividualCostPaymentInstance) runParams.get(AbilityKey.IndividualCostPaymentInstance);
-            SpellAbility sa = currentPayment.getPayment().getAbility();
+
+            SpellAbility sa;
+            if (currentPayment != null) {
+                sa = currentPayment.getPayment().getAbility();
 
                 if (sa != null && sa.getHostCard() != null) {
                     if (sa.isSpell() && sa.getHostCard().hasStartOfUnHiddenKeyword(keyword)) {
                         withKeyword = true;
                     }
                 }
+            }
 
             if (!withKeyword) {
                 // When done for another card to get the Mana, the Emerge card is there

forge-gui/res/cardsfolder/c/closing_statement.txt

@@ -3,6 +3,6 @@ ManaCost:3 W B
 Types:Instant
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | Phases$ End of Turn | PlayerTurn$ You | EffectZone$ All | Description$ This spell costs {2} less to cast during your end step.
 A:SP$ Destroy | Cost$ 3 W B | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | TgtPrompt$ Select target creature or planeswalker you don't control | SubAbility$ DBPutCounter | SpellDescription$ Destroy target creature or planeswalker you don't control. Put a +1/+1 counter on up to one target creature you control.
-SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select up to one target creature you don't control | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 1
+SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select up to one target creature you control | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:This spell costs {2} less to cast during your end step.\nDestroy target creature or planeswalker you don't control. Put a +1/+1 counter on up to one target creature you control.

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

@@ -0,0 +1,10 @@
+Name:Rise and Shine
+ManaCost:1 U
+Types:Sorcery
+A:SP$ Animate | ValidTgts$ Artifact.nonCreature+YouCtrl | TgtPrompt$ Select target noncreature artifact you control | Types$ Artifact,Creature | Duration$ Permanent | Power$ 0 | Toughness$ 0 | RememberAnimated$ True | SubAbility$ DBPutCounter | StackDescription$ {c:Targeted} becomes a 0/0 artifact creature. | SpellDescription$ Target noncreature artifact you control becomes a 0/0 artifact creature. Put four +1/+1 counters on each artifact that became a creature this way.
+A:SP$ AnimateAll | Cost$ 4 U U | ValidCards$ Artifact.nonCreature+YouCtrl | Types$ Artifact,Creature | Duration$ Permanent | Power$ 0 | Toughness$ 0 | PrecostDesc$ Overload | CostDesc$ {4}{U}{U} | NonBasicSpell$ True | RememberAnimated$ True | SubAbility$ DBPutCounter | StackDescription$ Each noncreature artifact {p:You} controls becomes a 0/0 artifact creature. | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 4 | SubAbility$ DBCleanup | StackDescription$ {p:You} puts four +1/+1 counters on each artifact that became a creature this way. | SpellDescription$ Put four +1/+1 counters on each artifact that became a creature this way.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters
+DeckNeeds:Type$Artifact
+Oracle:Target noncreature artifact you control becomes a 0/0 artifact creature. Put four +1/+1 counters on each artifact that became a creature this way.\nOverload {4}{U}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")