github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-14 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2016-03-06 10:25:11 +01:00
parent 0c242bce5f
commit 619856c8f5
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/release/readme.txt
View file

@ -11,7 +11,7 @@ You can download this from: http://java.com/
Installing and running XMage Installing and running XMage
You will need to download both the client and the server applications. These can be You will need to download both the client and the server applications. These can be
obtained from HTTP://XMage.info. obtained from HTTP://XMage.de.
Extact the client and the server to separate folders. Extact the client and the server to separate folders.
To play a game you can either connect to a server or start your own server. To To play a game you can either connect to a server or start your own server. To

2
Mage.Server/server.msg.txt
View file

@ -2,5 +2,5 @@ HotKeys: Alt+E - Enlarge card image
Wheel zoom in/out - Enlarge card image Wheel zoom in/out - Enlarge card image
F4 - end current turn, response to stack F4 - end current turn, response to stack
F9 - skip all opponents' turns, no response to stack F9 - skip all opponents' turns, no response to stack
Welcome! You are playing Mage version 1.4.3 Welcome! You are playing Mage version 1.4.9
Contact us on www.slightlymagic.net Contact us on www.slightlymagic.net

8
Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java
View file

@ -1,4 +1,4 @@
/* /*
* To change this template, choose Tools | Templates * To change this template, choose Tools | Templates
* and open the template in the editor. * and open the template in the editor.
*/ */
@ -23,7 +23,7 @@ import mage.game.Game;
public class ConditionalActivatedAbility extends ActivatedAbilityImpl { public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
private static final Effects emptyEffects = new Effects(); private static final Effects emptyEffects = new Effects();
private final Condition condition; private final Condition condition;
private String ruleText = null; private String ruleText = null;
@ -31,7 +31,7 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
super(zone, effect, cost); super(zone, effect, cost);
this.condition = condition; this.condition = condition;
} }
public ConditionalActivatedAbility(Zone zone, Effect effect, ManaCosts cost, Condition condition, String rule) { public ConditionalActivatedAbility(Zone zone, Effect effect, ManaCosts cost, Condition condition, String rule) {
super(zone, effect, cost); super(zone, effect, cost);
this.condition = condition; this.condition = condition;
@ -82,6 +82,6 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
if (ruleText != null && !ruleText.isEmpty()) { if (ruleText != null && !ruleText.isEmpty()) {
return ruleText; return ruleText;
} }
return new StringBuilder(super.getRule()).append(" Activate this ability only ").append(condition.toString()).append(".").toString(); return super.getRule() + " Activate this ability only " + condition.toString();
} }
} }