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

Merge pull request #5531 from magefree/master

Browse source 
merge
This commit is contained in:
Evan Kranzler 2019-01-16 15:12:30 -05:00 • committed by GitHub
commit b21f60bc0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
84 changed files with 1493 additions and 1251 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java
View file

@ -27,8 +27,14 @@ public class SacrificeTargetCost extends CostImpl {
this.addTarget(target);
target.setNotTarget(true); // sacrifice is never targeted
this.text = "sacrifice "
+ ((target.getNumberOfTargets() != 1 || (target.getTargetName().startsWith("an") || target.getTargetName().startsWith("a ")))
? (target.getMinNumberOfTargets() == target.getMaxNumberOfTargets() && target.getMinNumberOfTargets() > 1 ? CardUtil.numberToText(target.getNumberOfTargets()) : "" ) : (target.getTargetName().startsWith("artifact") ? "an " : "a ")) + target.getTargetName();
+ ((target.getNumberOfTargets() != 1
|| (target.getTargetName().startsWith("an")
|| target.getTargetName().startsWith("a ")))
? (target.getMinNumberOfTargets() == target.getMaxNumberOfTargets()
&& target.getMinNumberOfTargets() > 1
? CardUtil.numberToText(target.getNumberOfTargets()) + " " : "")
: (target.getTargetName().startsWith("artifact") ? "an " : "a "))
+ target.getTargetName();
target.setTargetName(target.getTargetName() + " (to sacrifice)");
}

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -36,7 +36,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 51;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 123;
private static final long CARD_CONTENT_VERSION = 214;
private Dao<CardInfo, Object> cardDao;
private Set<String> classNames;
private RepositoryEventSource eventSource = new RepositoryEventSource();

4
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -1063,7 +1063,7 @@ public abstract class GameImpl implements Game, Serializable {
}
private void initGameDefaultWatchers() {
public void initGameDefaultWatchers() {
getState().addWatcher(new MorbidWatcher());
getState().addWatcher(new CastSpellLastTurnWatcher());
getState().addWatcher(new CastSpellYourLastTurnWatcher());
@ -1075,7 +1075,7 @@ public abstract class GameImpl implements Game, Serializable {
getState().addWatcher(new PlayersAttackedThisTurnWatcher());
}
private void initPlayerDefaultWatchers(UUID playerId) {
public void initPlayerDefaultWatchers(UUID playerId) {
getState().addWatcher(new PlayerDamagedBySourceWatcher(playerId));
getState().addWatcher(new BloodthirstWatcher(playerId));
}

2
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -463,7 +463,7 @@ public class Combat implements Serializable, Copyable<Combat> {
target.setRequired(true);
target.setTargetName("planeswalker or player for " + creature.getLogName() + " to attack");
if (player.chooseTarget(Outcome.Damage, target, null, game)) {
System.out.println("The player " + player.getName() + " declares an attacker here. " + creature.getName());
//System.out.println("The player " + player.getName() + " declares an attacker here. " + creature.getName());
player.declareAttacker(creature.getId(), target.getFirstTarget(), game, false);
}
}