diff --git a/res/quest/all-prices.txt b/res/quest/all-prices.txt index 0d27af76199..2de609a3469 100644 --- a/res/quest/all-prices.txt +++ b/res/quest/all-prices.txt @@ -1290,6 +1290,7 @@ Cease-Fire =25 Ceaseless Searblades =25 Celestial Ancient =43 Celestial Convergence =35 +Celestial Colonnade =539 Celestial Crusader =5 Celestial Dawn =25 Celestial Gatekeeper =25 diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 0c5dd56c8c0..0f11defc67f 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -1454,6 +1454,12 @@ public class CombatUtil { for (Card c:cl) { + if (!c.getCreatureBlockedThisCombat()) { + for(Ability ab:CardFactoryUtil.getBushidoEffects(c)) { + AllZone.Stack.add(ab); + } + } + if (c.getKeyword().contains("Defender") && !c.getCreatureBlockedThisCombat()) { final Card crd = c; @@ -1536,11 +1542,6 @@ public class CombatUtil { for(Ability ab:CardFactoryUtil.getBushidoEffects(a)) AllZone.Stack.add(ab); } - if (!b.getCreatureBlockedThisCombat()) { - for(Ability ab:CardFactoryUtil.getBushidoEffects(b)) - AllZone.Stack.add(ab); - b.setCreatureBlockedThisCombat(true); - } if(a.getKeyword().contains("Flanking") && !b.getKeyword().contains("Flanking")) { int flankingMagnitude = 0;