External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 02:52:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2016-09-10 11:44:52 +02:00
parent 678a46dba8
commit 79f8617cd3
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java
View file

@ -70,7 +70,7 @@ public class MassMutiny extends CardImpl {
Player opponent = game.getPlayer(opponentId); Player opponent = game.getPlayer(opponentId);
if (opponent != null) { if (opponent != null) {
ability.getTargets().clear(); ability.getTargets().clear();
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getLogName()); FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getName());
filter.add(new ControllerIdPredicate(opponentId)); filter.add(new ControllerIdPredicate(opponentId));
TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false); TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false);
ability.addTarget(target); ability.addTarget(target);

12
Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java
View file

@ -94,15 +94,14 @@ class NykthosShrineToNyxManaAbility extends ManaAbility {
public List<Mana> getNetMana(Game game) { public List<Mana> getNetMana(Game game) {
netMana.clear(); netMana.clear();
if (game != null) { if (game != null) {
for (String colorChoice :ChoiceColor.colorChoices) { for (String colorChoice : ChoiceColor.colorChoices) {
netMana.add(((NykthosDynamicManaEffect)this.getEffects().get(0)).computeMana(colorChoice, game, this)); netMana.add(((NykthosDynamicManaEffect) this.getEffects().get(0)).computeMana(colorChoice, game, this));
} }
} }
return netMana; return netMana;
} }
} }
class NykthosDynamicManaEffect extends ManaEffect { class NykthosDynamicManaEffect extends ManaEffect {
private final Mana computedMana; private final Mana computedMana;
@ -132,7 +131,7 @@ class NykthosDynamicManaEffect extends ManaEffect {
if (controller.choose(outcome, choice, game)) { if (controller.choose(outcome, choice, game)) {
computeMana(choice.getChoice(), game, source); computeMana(choice.getChoice(), game, source);
checkToFirePossibleEvents(computedMana, game, source); checkToFirePossibleEvents(computedMana, game, source);
game.getPlayer(source.getControllerId()).getManaPool().addMana(computedMana, game, source); controller.getManaPool().addMana(computedMana, game, source);
return true; return true;
} }
} }
@ -145,10 +144,9 @@ class NykthosDynamicManaEffect extends ManaEffect {
return null; return null;
} }
public Mana computeMana(String color, Game game, Ability source) {
public Mana computeMana(String color, Game game, Ability source){
this.computedMana.clear(); this.computedMana.clear();
if (color !=null && !color.isEmpty()) { if (color != null && !color.isEmpty()) {
switch (color) { switch (color) {
case "Red": case "Red":
computedMana.setRed(new DevotionCount(ColoredManaSymbol.R).calculate(game, source, this)); computedMana.setRed(new DevotionCount(ColoredManaSymbol.R).calculate(game, source, this));

11
Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java
View file

@ -24,15 +24,13 @@
* The views and conclusions contained in the software and documentation are those of the * The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.condition.common; package mage.abilities.condition.common;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.condition.Condition; import mage.abilities.condition.Condition;
import mage.game.Game; import mage.game.Game;
/** /**
* Checks if permanent was paid tribute to as it entered the battlefield * Checks if permanent was paid tribute to as it entered the battlefield
* *
@ -42,7 +40,8 @@ public class TributeNotPaidCondition implements Condition {
private static TributeNotPaidCondition fInstance = null; private static TributeNotPaidCondition fInstance = null;
private TributeNotPaidCondition() {} private TributeNotPaidCondition() {
}
public static Condition getInstance() { public static Condition getInstance() {
if (fInstance == null) { if (fInstance == null) {
@ -53,9 +52,9 @@ public class TributeNotPaidCondition implements Condition {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Object tribute = game.getState().getValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString()); Object tribute = game.getState().getValue("tributeValue" + source.getSourceId());
if (tribute != null) { if (tribute != null) {
return ((String)tribute).equals("no"); return ((String) tribute).equals("no");
} }
return false; return false;
} }

3
Utils/release/getting_implemented_cards.txt
View file

@ -93,6 +93,9 @@ git log 80f4ab770b78b7a7211490ff961ee90998bdc01c..head --diff-filter=A --name-st
since 1.4.13v3 since 1.4.13v3
git log 7c2eaf9510b1b49fecc28f5c8e68d5377c7a7e3e..head --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt git log 7c2eaf9510b1b49fecc28f5c8e68d5377c7a7e3e..head --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
since 1.4.14v0
git log 7c2eaf9510b1b49fecc28f5c8e68d5377c7a7e3e..head --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
3. Copy added_cards.txt to trunk\Utils folder 3. Copy added_cards.txt to trunk\Utils folder
4. Run script: 4. Run script:
> perl extract_in_wiki_format.perl > perl extract_in_wiki_format.perl