external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixes' into 'master'

Browse Source 
Fix Minimus Containment

See merge request core-developers/forge!5182
This commit is contained in:
Michael Kamensky
2021-08-05 15:59:06 +00:00
parent 118e81d046 bb2c967f6e
commit 1d4f68d95f
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java
View File

@@ -370,8 +370,7 @@ public class CountersMoveAi extends SpellAbilityAi {
Card lki = CardUtil.getLKICopy(src); Card lki = CardUtil.getLKICopy(src);
if (cType == null) { if (cType == null) {
lki.clearCounters(); lki.clearCounters();
} } else {
else {
lki.setCounters(cType, 0); lki.setCounters(cType, 0);
} }
// go for opponent when higher value implies debuff // go for opponent when higher value implies debuff

1
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -3450,7 +3450,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
runParams.put(AbilityKey.AttachSource, this); runParams.put(AbilityKey.AttachSource, this);
runParams.put(AbilityKey.AttachTarget, entity); runParams.put(AbilityKey.AttachTarget, entity);
getController().getGame().getTriggerHandler().runTrigger(TriggerType.Attached, runParams, false); getController().getGame().getTriggerHandler().runTrigger(TriggerType.Attached, runParams, false);
} }
public final void unattachFromEntity(final GameEntity entity) { public final void unattachFromEntity(final GameEntity entity) {

6
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -301,7 +301,7 @@ public class Combat {
return ab; return ab;
} }
} }
CombatLki lki = lkiCache.get(c).getCombatLKI(); CombatLki lki = lkiCache.get(c) != null ? lkiCache.get(c).getCombatLKI() : null;
return lki == null || !lki.isAttacker ? null : lki.getFirstBand(); return lki == null || !lki.isAttacker ? null : lki.getFirstBand();
} }
@@ -911,7 +911,7 @@ public class Combat {
return false; return false;
} }
CombatLki lki = lkiCache.get(blocker).getCombatLKI(); CombatLki lki = lkiCache.get(blocker) != null ? lkiCache.get(blocker).getCombatLKI() : null;
return null != lki && !lki.isAttacker; // was blocking something anyway return null != lki && !lki.isAttacker; // was blocking something anyway
} }
@@ -926,7 +926,7 @@ public class Combat {
return false; return false;
} }
CombatLki lki = lkiCache.get(blocker).getCombatLKI(); CombatLki lki = lkiCache.get(blocker) != null ? lkiCache.get(blocker).getCombatLKI() : null;
return null != lki && !lki.isAttacker && lki.relatedBands.contains(ab); // was blocking that very band return null != lki && !lki.isAttacker && lki.relatedBands.contains(ab); // was blocking that very band
} }

2
forge-gui/res/cardsfolder/m/minimus_containment.txt
View File

@@ -3,6 +3,6 @@ ManaCost:2 W
Types:Enchantment Aura Types:Enchantment Aura
K:Enchant nonland permanent K:Enchant nonland permanent
A:SP$ Attach | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AILogic$ Curse A:SP$ Attach | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AILogic$ Curse
S:Mode$ Continuous | Affected$ Permanent.EnchantedBy | AddType$ Artifact & Treasure | RemoveCardTypes$ True | AddAbility$ TreasureSac | RemoveAllAbilities$ True | Description$ Enchanted permanent is a Treasure artifact with "{T}, Sacrifice this artifact: Add one mana of any color," and it loses all other abilities. (If it was a creature, it's no longer a creature.) S:Mode$ Continuous | Affected$ Permanent.EnchantedBy | AddType$ Artifact & Treasure | RemoveCardTypes$ True | RemoveArtifactTypes$ True | AddAbility$ TreasureSac | RemoveAllAbilities$ True | Description$ Enchanted permanent is a Treasure artifact with "{T}, Sacrifice this artifact: Add one mana of any color," and it loses all other abilities. (If it was a creature, it's no longer a creature.)
SVar:TreasureSac:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color. SVar:TreasureSac:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
Oracle:Enchant nonland permanent\nEnchanted permanent is a Treasure artifact with "{T}, Sacrifice this artifact: Add one mana of any color," and it loses all other abilities. (If it was a creature, it's no longer a creature.) Oracle:Enchant nonland permanent\nEnchanted permanent is a Treasure artifact with "{T}, Sacrifice this artifact: Add one mana of any color," and it loses all other abilities. (If it was a creature, it's no longer a creature.)