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

- More fixes (quest and combat).

Browse Source
This commit is contained in:
jendave
2011-08-06 04:59:00 +00:00
parent a3964c07ca
commit 1f1068f77e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/forge/GameActionUtil.java
View File

@@ -4744,7 +4744,8 @@ public class GameActionUtil {
}; // ability2 }; // ability2
ability2.setStackDescription("Guilty Conscience deals " + damage + " damage to " + c.getName()); ability2.setStackDescription("Guilty Conscience deals " + damage + " damage to " + c.getName());
AllZone.Stack.add(ability2); if (damage >= 0)
AllZone.Stack.add(ability2);
} }
public static void executeGuiltyConscienceEffects(Card c, Card source, int n) { public static void executeGuiltyConscienceEffects(Card c, Card source, int n) {

2
src/forge/Gui_WinLose.java
View File

@@ -150,7 +150,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
if (turn < 1) if (turn < 1)
turn = 1; turn = 1;
winLose.setWinTurn(game, AllZone.Phase.getTurn()); winLose.setWinTurn(game, turn);
winLose.setMulliganedToZero(game, AllZone.GameInfo.getHumanMulliganedToZero()); winLose.setMulliganedToZero(game, AllZone.GameInfo.getHumanMulliganedToZero());
//winLose.setWinTurn(winLose.countWinLose()-1, AllZone.Phase.getTurn()); //winLose.setWinTurn(winLose.countWinLose()-1, AllZone.Phase.getTurn());