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

*Fixed Annihilator keyword.

Browse Source 
*Re-fixed Tangle Wire.
This commit is contained in:
jendave
2011-08-06 21:33:58 +00:00
parent fed89b3d35
commit 3a431d74be
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/forge/GameActionUtil.java
View File

@@ -4915,7 +4915,11 @@ public class GameActionUtil {
AllZone.InputControl.setInput(new Input() { AllZone.InputControl.setInput(new Input() {
private static final long serialVersionUID = 5313424586016061612L; private static final long serialVersionUID = 5313424586016061612L;
public void showMessage() { public void showMessage() {
if(list.size() == 0) stop(); if(list.size() == 0)
{
stop();
return;
}
AllZone.Display.showMessage(source.getName()+" - Select "+num+" untapped artifact(s), creature(s), or land(s) you control"); AllZone.Display.showMessage(source.getName()+" - Select "+num+" untapped artifact(s), creature(s), or land(s) you control");
ButtonUtil.disableAll(); ButtonUtil.disableAll();
} }
@@ -4923,7 +4927,6 @@ public class GameActionUtil {
if(zone.is(Constant.Zone.Battlefield, AllZone.HumanPlayer) && list.contains(card)) { if(zone.is(Constant.Zone.Battlefield, AllZone.HumanPlayer) && list.contains(card)) {
card.tap(); card.tap();
list.remove(card); list.remove(card);
if(list.size() == 0) AllZone.InputControl.resetInput();
stop(); stop();
} }
} }

12
src/forge/card/cardFactory/CardFactoryUtil.java
View File

@@ -751,7 +751,11 @@ public class CardFactoryUtil {
@Override @Override
public void showMessage() { public void showMessage() {
//in case no more {type}s in play //in case no more {type}s in play
if(n == nCards || list.size() == 0) stop(); if(n == nCards || list.size() == 0)
{
stop();
return;
}
AllZone.Display.showMessage(message + " (" +(nCards-n) +" left)"); AllZone.Display.showMessage(message + " (" +(nCards-n) +" left)");
ButtonUtil.disableAll(); ButtonUtil.disableAll();
@@ -765,7 +769,11 @@ public class CardFactoryUtil {
list.remove(card); list.remove(card);
//in case no more {type}s in play //in case no more {type}s in play
if(n == nCards || list.size() == 0) stop(); if(n == nCards || list.size() == 0)
{
stop();
return;
}
else else
showMessage(); showMessage();
} }