github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 11:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-05-28 23:47:28 +02:00
commit 485ea2729a
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
View file

@ -76,7 +76,7 @@ public class ExertAbility extends SimpleStaticAbility {
ruleText += ". "; ruleText += ". ";
ability.setRuleVisible(false); ability.setRuleVisible(false);
} }
ruleText += "<i>(An exerted creature can't untap during your next untap step)</i>"; ruleText += "<i>(An exerted creature won't untap during your next untap step)</i>";
if (exertOnlyOncePerTurn) { if (exertOnlyOncePerTurn) {
getWatchers().add(new ExertedThisTurnWatcher()); getWatchers().add(new ExertedThisTurnWatcher());
} }
@ -142,7 +142,7 @@ class ExertReplacementEffect extends ReplacementEffectImpl {
} }
} }
if (controller.chooseUse(outcome, "Exert " + creature.getLogName() + '?', if (controller.chooseUse(outcome, "Exert " + creature.getLogName() + '?',
"An exerted creature can't untap during your next untap step.", "Yes", "No", source, game)) { "An exerted creature won't untap during your next untap step.", "Yes", "No", source, game)) {
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(controller.getLogName() + " exerted " + creature.getName()); game.informPlayers(controller.getLogName() + " exerted " + creature.getName());
} }

20
Mage/src/main/java/mage/constants/SubType.java
View file

@ -97,7 +97,7 @@ public enum SubType {
DRONE("Drone", SubTypeSet.CreatureType, false), DRONE("Drone", SubTypeSet.CreatureType, false),
DRUID("Druid", SubTypeSet.CreatureType, false), DRUID("Druid", SubTypeSet.CreatureType, false),
DROID("Droid", SubTypeSet.CreatureType, true), DROID("Droid", SubTypeSet.CreatureType, true),
DRYAD("Dryad", SubTypeSet.CreatureType, true), DRYAD("Dryad", SubTypeSet.CreatureType, false),
DWARF("Dwarf", SubTypeSet.CreatureType, false), DWARF("Dwarf", SubTypeSet.CreatureType, false),
EFREET("Efreet", SubTypeSet.CreatureType, false), EFREET("Efreet", SubTypeSet.CreatureType, false),
@ -152,20 +152,20 @@ public enum SubType {
INSECT("Insect", SubTypeSet.CreatureType, false), INSECT("Insect", SubTypeSet.CreatureType, false),
JEDI("Jedi", SubTypeSet.CreatureType, true), JEDI("Jedi", SubTypeSet.CreatureType, true),
JELLYFISH("Jellyfish", SubTypeSet.CreatureType, true), JELLYFISH("Jellyfish", SubTypeSet.CreatureType, false),
JUGGERNAUT("Juggernaut", SubTypeSet.CreatureType, true), JUGGERNAUT("Juggernaut", SubTypeSet.CreatureType, false),
KAVU("Kavu", SubTypeSet.CreatureType, true), KAVU("Kavu", SubTypeSet.CreatureType, false),
KIRIN("Kirin", SubTypeSet.CreatureType, true), KIRIN("Kirin", SubTypeSet.CreatureType, false),
KITHKIN("Kithkin", SubTypeSet.CreatureType, false), KITHKIN("Kithkin", SubTypeSet.CreatureType, false),
KNIGHT("Knight", SubTypeSet.CreatureType, false), KNIGHT("Knight", SubTypeSet.CreatureType, false),
KOBOLD("Kobold", SubTypeSet.CreatureType, false), KOBOLD("Kobold", SubTypeSet.CreatureType, false),
KOR("Kor", SubTypeSet.CreatureType, false), KOR("Kor", SubTypeSet.CreatureType, false),
KRAKEN("Kraken", SubTypeSet.CreatureType, false), KRAKEN("Kraken", SubTypeSet.CreatureType, false),
LAMIA("Lamia", SubTypeSet.CreatureType, true), LAMIA("Lamia", SubTypeSet.CreatureType, false),
LAMMASU("Lammasu", SubTypeSet.CreatureType, true), LAMMASU("Lammasu", SubTypeSet.CreatureType, false),
LEECH("Leech", SubTypeSet.CreatureType, true), LEECH("Leech", SubTypeSet.CreatureType, false),
LEVIATHAN("Leviathan", SubTypeSet.CreatureType, false), LEVIATHAN("Leviathan", SubTypeSet.CreatureType, false),
LHURGOYF("Lhurgoyf", SubTypeSet.CreatureType, false), LHURGOYF("Lhurgoyf", SubTypeSet.CreatureType, false),
LICID("Licid", SubTypeSet.CreatureType, false), LICID("Licid", SubTypeSet.CreatureType, false),
@ -379,5 +379,9 @@ public enum SubType {
public static Set<String> getBasicLands(boolean customSet) { public static Set<String> getBasicLands(boolean customSet) {
return Arrays.stream(values()).filter(s -> s.customSet == customSet).filter(p -> p.getSubTypeSet() == SubTypeSet.BasicLandType).map(SubType::getDescription).collect(Collectors.toSet()); return Arrays.stream(values()).filter(s -> s.customSet == customSet).filter(p -> p.getSubTypeSet() == SubTypeSet.BasicLandType).map(SubType::getDescription).collect(Collectors.toSet());
} }
public static Set<String> getLandTypes(boolean customSet){
return Arrays.stream(values()).filter(s->s.customSet==customSet).filter(p->p.getSubTypeSet() == SubTypeSet.BasicLandType || p.getSubTypeSet() == SubTypeSet.NonBasicLandType).map(SubType::getDescription).collect(Collectors.toSet());
}
} }