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

* LogName - Changed some more messages to use the logName instead of name.

Browse source
This commit is contained in:
LevelX2 2014-06-13 14:02:56 +02:00
parent 77bd944d82
commit 2305cc5274
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/mage/abilities/abilityword/KinshipAbility.java
View file

@ -120,10 +120,10 @@ class KinshipBaseEffect extends OneShotEffect {
Card card = controller.getLibrary().getFromTop(game); Card card = controller.getLibrary().getFromTop(game);
if (card != null) { if (card != null) {
Cards cards = new CardsImpl(card); Cards cards = new CardsImpl(card);
controller.lookAtCards(sourcePermanent.getName(), cards, game); controller.lookAtCards(sourcePermanent.getLogName(), cards, game);
if (CardUtil.shareSubtypes(sourcePermanent, card)) { if (CardUtil.shareSubtypes(sourcePermanent, card)) {
if (controller.chooseUse(outcome,new StringBuilder("Kinship - Reveal ").append(card.getName()).append("?").toString(), game)) { if (controller.chooseUse(outcome,new StringBuilder("Kinship - Reveal ").append(card.getLogName()).append("?").toString(), game)) {
controller.revealCards(sourcePermanent.getName(), cards, game); controller.revealCards(sourcePermanent.getLogName(), cards, game);
for (Effect effect: kinshipEffects) { for (Effect effect: kinshipEffects) {
effect.setTargetPointer(new FixedTarget(card.getId())); effect.setTargetPointer(new FixedTarget(card.getId()));
if (effect.getEffectType().equals(EffectType.ONESHOT)) { if (effect.getEffectType().equals(EffectType.ONESHOT)) {

2
Mage/src/mage/abilities/common/CastCommanderAbility.java
View file

@ -42,7 +42,7 @@ import mage.game.Game;
public class CastCommanderAbility extends SpellAbility { public class CastCommanderAbility extends SpellAbility {
public CastCommanderAbility(Card card) { public CastCommanderAbility(Card card) {
super(card.getManaCost(), card.getName(), Zone.COMMAND, SpellAbilityType.BASE); super(card.getManaCost(), card.getLogName(), Zone.COMMAND, SpellAbilityType.BASE);
this.timing = TimingRule.SORCERY; this.timing = TimingRule.SORCERY;
this.usesStack = true; this.usesStack = true;
this.controllerId = card.getOwnerId(); this.controllerId = card.getOwnerId();

18
Mage/src/mage/game/combat/Combat.java
View file

@ -260,7 +260,7 @@ public class Combat implements Serializable, Copyable<Combat> {
for (UUID attackingCreatureId : group.getAttackers()) { for (UUID attackingCreatureId : group.getAttackers()) {
Permanent attacker = game.getPermanent(attackingCreatureId); Permanent attacker = game.getPermanent(attackingCreatureId);
if (count > 1 && attacker != null && attacker.getAbilities().containsKey(CanAttackOnlyAloneAbility.getInstance().getId())) { if (count > 1 && attacker != null && attacker.getAbilities().containsKey(CanAttackOnlyAloneAbility.getInstance().getId())) {
game.informPlayers(attacker.getName() + " can only attack alone. Removing it from combat."); game.informPlayers(attacker.getLogName() + " can only attack alone. Removing it from combat.");
tobeRemoved.add(attackingCreatureId); tobeRemoved.add(attackingCreatureId);
count--; count--;
} }
@ -277,7 +277,7 @@ public class Combat implements Serializable, Copyable<Combat> {
for (UUID attackingCreatureId : group.getAttackers()) { for (UUID attackingCreatureId : group.getAttackers()) {
Permanent attacker = game.getPermanent(attackingCreatureId); Permanent attacker = game.getPermanent(attackingCreatureId);
if (attacker != null && attacker.getAbilities().containsKey(CantAttackAloneAbility.getInstance().getId())) { if (attacker != null && attacker.getAbilities().containsKey(CantAttackAloneAbility.getInstance().getId())) {
game.informPlayers(attacker.getName() + " can't attack alone. Removing it from combat."); game.informPlayers(attacker.getLogName() + " can't attack alone. Removing it from combat.");
tobeRemoved.add(attackingCreatureId); tobeRemoved.add(attackingCreatureId);
} }
} }
@ -358,13 +358,13 @@ public class Combat implements Serializable, Copyable<Combat> {
Permanent attackingCreature = game.getPermanent(attackingCreatureId); Permanent attackingCreature = game.getPermanent(attackingCreatureId);
if (attackingCreature != null) { if (attackingCreature != null) {
sb.append("Attacker: "); sb.append("Attacker: ");
sb.append(attackingCreature.getName()).append(" ("); sb.append(attackingCreature.getLogName()).append(" (");
sb.append(attackingCreature.getPower().getValue()).append("/").append(attackingCreature.getToughness().getValue()).append(") "); sb.append(attackingCreature.getPower().getValue()).append("/").append(attackingCreature.getToughness().getValue()).append(") ");
} else { } else {
// creature left battlefield // creature left battlefield
attackingCreature = (Permanent) game.getLastKnownInformation(attackingCreatureId, Zone.BATTLEFIELD); attackingCreature = (Permanent) game.getLastKnownInformation(attackingCreatureId, Zone.BATTLEFIELD);
if (attackingCreature != null) { if (attackingCreature != null) {
sb.append(attackingCreature.getName()).append(" [left battlefield)] "); sb.append(attackingCreature.getLogName()).append(" [left battlefield)] ");
} }
} }
} }
@ -374,7 +374,7 @@ public class Combat implements Serializable, Copyable<Combat> {
for (UUID blockingCreatureId : group.getBlockers()) { for (UUID blockingCreatureId : group.getBlockers()) {
Permanent blockingCreature = game.getPermanent(blockingCreatureId); Permanent blockingCreature = game.getPermanent(blockingCreatureId);
if (blockingCreature != null) { if (blockingCreature != null) {
sb.append(blockingCreature.getName()).append(" ("); sb.append(blockingCreature.getLogName()).append(" (");
sb.append(blockingCreature.getPower().getValue()).append("/").append(blockingCreature.getToughness().getValue()).append(") "); sb.append(blockingCreature.getPower().getValue()).append("/").append(blockingCreature.getToughness().getValue()).append(") ");
} }
} }
@ -554,7 +554,7 @@ public class Combat implements Serializable, Copyable<Combat> {
// if so inform human player or set block for AI player // if so inform human player or set block for AI player
if (mayBlock) { if (mayBlock) {
if (controller.isHuman()) { if (controller.isHuman()) {
game.informPlayer(controller, "Creature should block this turn: " + creature.getName()); game.informPlayer(controller, "Creature should block this turn: " + creature.getLogName());
} else { } else {
Player defender = game.getPlayer(creature.getControllerId()); Player defender = game.getPlayer(creature.getControllerId());
if (defender != null) { if (defender != null) {
@ -622,7 +622,7 @@ public class Combat implements Serializable, Copyable<Combat> {
} }
} }
if (possibleBlockerAvailable) { if (possibleBlockerAvailable) {
game.informPlayer(controller, new StringBuilder(toBeBlockedCreature.getName()).append(" has to be blocked by at least one creature.").toString()); game.informPlayer(controller, new StringBuilder(toBeBlockedCreature.getLogName()).append(" has to be blocked by at least one creature.").toString());
return false; return false;
} }
} }
@ -681,7 +681,7 @@ public class Combat implements Serializable, Copyable<Combat> {
} }
if (!blockIsValid) { if (!blockIsValid) {
sb.append(" ").append(creatureForcedToBlock.getName()); sb.append(" ").append(creatureForcedToBlock.getLogName());
} }
} }
if (sb.length() > 0) { if (sb.length() > 0) {
@ -711,7 +711,7 @@ public class Combat implements Serializable, Copyable<Combat> {
for (Ability ability : entry.getValue()) { for (Ability ability : entry.getValue()) {
if (!effect.canBeBlockedCheckAfter(attackingCreature, ability, game)) { if (!effect.canBeBlockedCheckAfter(attackingCreature, ability, game)) {
if (controller.isHuman()) { if (controller.isHuman()) {
game.informPlayer(controller, new StringBuilder(attackingCreature.getName()).append(" can't be blocked this way.").toString()); game.informPlayer(controller, new StringBuilder(attackingCreature.getLogName()).append(" can't be blocked this way.").toString());
return false; return false;
} else { } else {
// remove blocking creatures for AI // remove blocking creatures for AI

14
Mage/src/mage/game/combat/CombatGroup.java
View file

@ -143,7 +143,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
Permanent attacker = game.getPermanent(attackers.get(0)); Permanent attacker = game.getPermanent(attackers.get(0));
if (attacker.getAbilities().containsKey(DamageAsThoughNotBlockedAbility.getInstance().getId())) { if (attacker.getAbilities().containsKey(DamageAsThoughNotBlockedAbility.getInstance().getId())) {
Player player = game.getPlayer(attacker.getControllerId()); Player player = game.getPlayer(attacker.getControllerId());
if (player.chooseUse(Outcome.Damage, "Do you wish to assign damage for " + attacker.getName() + " as though it weren't blocked?", game)) { if (player.chooseUse(Outcome.Damage, "Do you wish to assign damage for " + attacker.getLogName() + " as though it weren't blocked?", game)) {
blocked = false; blocked = false;
unblockedDamage(first, game); unblockedDamage(first, game);
} }
@ -244,7 +244,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
} }
else { else {
Player player = game.getPlayer(attacker.getControllerId()); Player player = game.getPlayer(attacker.getControllerId());
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getName(), game); int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getLogName(), game);
blocker.markDamage(damageAssigned, attacker.getId(), game, true, true); blocker.markDamage(damageAssigned, attacker.getId(), game, true, true);
damage -= damageAssigned; damage -= damageAssigned;
if (damage > 0) { if (damage > 0) {
@ -298,7 +298,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
damage = 0; damage = 0;
break; break;
} }
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getName(), game); int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getLogName(), game);
assigned.put(blockerId, damageAssigned); assigned.put(blockerId, damageAssigned);
damage -= damageAssigned; damage -= damageAssigned;
} }
@ -378,7 +378,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
assigned.put(attackerId, damage); assigned.put(attackerId, damage);
break; break;
} }
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + attacker.getName(), game); int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + attacker.getLogName(), game);
assigned.put(attackerId, damageAssigned); assigned.put(attackerId, damageAssigned);
damage -= damageAssigned; damage -= damageAssigned;
} }
@ -537,7 +537,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
Permanent blocker = game.getPermanent(blockerId); Permanent blocker = game.getPermanent(blockerId);
if (blocker != null && blocker.getAbilities().containsKey(CantBlockAloneAbility.getInstance().getId())) { if (blocker != null && blocker.getAbilities().containsKey(CantBlockAloneAbility.getInstance().getId())) {
blockWasLegal = false; blockWasLegal = false;
game.informPlayers(blocker.getName() + " can't block alone. Removing it from combat."); game.informPlayers(blocker.getLogName() + " can't block alone. Removing it from combat.");
toBeRemoved.add(blockerId); toBeRemoved.add(blockerId);
} }
} }
@ -563,7 +563,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
blockers.clear(); blockers.clear();
blockerOrder.clear(); blockerOrder.clear();
this.blocked = false; this.blocked = false;
game.informPlayers(attacker.getName() + " can't be blocked except by " + attacker.getMinBlockedBy() + " or more creatures. Blockers discarded."); game.informPlayers(attacker.getLogName() + " can't be blocked except by " + attacker.getMinBlockedBy() + " or more creatures. Blockers discarded.");
blockWasLegal = false; blockWasLegal = false;
} }
// Check if there are to many blockers (maxBlockedBy = 0 means no restrictions) // Check if there are to many blockers (maxBlockedBy = 0 means no restrictions)
@ -577,7 +577,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
blockers.clear(); blockers.clear();
blockerOrder.clear(); blockerOrder.clear();
this.blocked = false; this.blocked = false;
game.informPlayers(new StringBuilder(attacker.getName()) game.informPlayers(new StringBuilder(attacker.getLogName())
.append(" can't be blocked by more than ").append(attacker.getMaxBlockedBy()) .append(" can't be blocked by more than ").append(attacker.getMaxBlockedBy())
.append(attacker.getMaxBlockedBy()==1?" creature.":" creatures.") .append(attacker.getMaxBlockedBy()==1?" creature.":" creatures.")
.append(" Blockers discarded.").toString()); .append(" Blockers discarded.").toString());