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

- Fixed Bushido not working for blockers.

Browse Source
This commit is contained in:
jendave
2011-08-06 03:47:15 +00:00
parent cba13e1230
commit 02fce18424
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/quest/all-prices.txt
View File

@@ -1290,6 +1290,7 @@ Cease-Fire =25
Ceaseless Searblades =25 Ceaseless Searblades =25
Celestial Ancient =43 Celestial Ancient =43
Celestial Convergence =35 Celestial Convergence =35
Celestial Colonnade =539
Celestial Crusader =5 Celestial Crusader =5
Celestial Dawn =25 Celestial Dawn =25
Celestial Gatekeeper =25 Celestial Gatekeeper =25

11
src/forge/CombatUtil.java
View File

@@ -1454,6 +1454,12 @@ public class CombatUtil {
for (Card c:cl) for (Card c:cl)
{ {
if (!c.getCreatureBlockedThisCombat()) {
for(Ability ab:CardFactoryUtil.getBushidoEffects(c)) {
AllZone.Stack.add(ab);
}
}
if (c.getKeyword().contains("Defender") && !c.getCreatureBlockedThisCombat()) if (c.getKeyword().contains("Defender") && !c.getCreatureBlockedThisCombat())
{ {
final Card crd = c; final Card crd = c;
@@ -1536,11 +1542,6 @@ public class CombatUtil {
for(Ability ab:CardFactoryUtil.getBushidoEffects(a)) for(Ability ab:CardFactoryUtil.getBushidoEffects(a))
AllZone.Stack.add(ab); 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")) { if(a.getKeyword().contains("Flanking") && !b.getKeyword().contains("Flanking")) {
int flankingMagnitude = 0; int flankingMagnitude = 0;