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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-04-15 21:54:46 +02:00
commit 5b6e3cd72e
815 changed files with 4030 additions and 3439 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1079,6 +1079,7 @@ public abstract class GameImpl implements Game, Serializable {
Plane plane = Plane.getRandomPlane();
plane.setControllerId(getActivePlayerId());
addPlane(plane, null, getActivePlayerId());
state.setPlaneChase(this, gameOptions.planeChase);
}
}
@ -1564,6 +1565,14 @@ public abstract class GameImpl implements Game, Serializable {
}
state.addCommandObject(newPlane);
informPlayers("You have planeswalked to " + newPlane.getLogName());
// Fire off the planeswalked event
GameEvent event = new GameEvent(GameEvent.EventType.PLANESWALK, newPlane.getId(), null, newPlane.getId(), 0, true);
if (!replaceEvent(event)) {
GameEvent ge = new GameEvent(GameEvent.EventType.PLANESWALKED, newPlane.getId(), null, newPlane.getId(), 0, true);
fireEvent(ge);
}
return true;
}

1
Mage/src/main/java/mage/game/events/GameEvent.java
View file

@ -232,6 +232,7 @@ public class GameEvent implements Serializable {
FLIP_COIN, COIN_FLIPPED, SCRY, FATESEAL,
ROLL_DICE, DICE_ROLLED,
ROLL_PLANAR_DIE, PLANAR_DIE_ROLLED,
PLANESWALK, PLANESWALKED,
PAID_CUMULATIVE_UPKEEP,
DIDNT_PAY_CUMULATIVE_UPKEEP,
//permanent events

2
Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
View file

@ -53,7 +53,7 @@ public class EldraziScionToken extends TokenImpl {
}
public EldraziScionToken() {
super("Eldrazi Scion", "1/1 colorless Eldrazi Scion creature token with \"Sacrifice this creature: Add {C} to your mana pool.\"");
super("Eldrazi Scion", "1/1 colorless Eldrazi Scion creature token with \"Sacrifice this creature: Add {C}.\"");
cardType.add(CardType.CREATURE);
subtype.add(SubType.ELDRAZI);
subtype.add(SubType.SCION);

2
Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java
View file

@ -53,7 +53,7 @@ public class EldraziSpawnToken extends TokenImpl {
}
public EldraziSpawnToken() {
super("Eldrazi Spawn", "0/1 colorless Eldrazi Spawn creature with \"Sacrifice this creature: Add {C} to your mana pool.\"");
super("Eldrazi Spawn", "0/1 colorless Eldrazi Spawn creature with \"Sacrifice this creature: Add {C}.\"");
cardType.add(CardType.CREATURE);
subtype.add(SubType.ELDRAZI);
subtype.add(SubType.SPAWN);

6
Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java
View file

@ -25,8 +25,8 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -57,7 +57,7 @@ public class FreyaliseLlanowarsFuryToken extends TokenImpl {
}
public FreyaliseLlanowarsFuryToken(String setCode, int tokenType) {
super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\"");
super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\"");
availableImageSetCodes = tokenImageSets;
setOriginalExpansionSetCode(setCode);
this.cardType.add(CardType.CREATURE);
@ -68,7 +68,7 @@ public class FreyaliseLlanowarsFuryToken extends TokenImpl {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
// {T}: Add {G} to your mana pool.
// {T}: Add {G}.
this.addAbility(new GreenManaAbility());
}

2
Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java
View file

@ -39,7 +39,7 @@ import mage.abilities.mana.GreenManaAbility;
public class LlanowarElvesToken extends TokenImpl {
public LlanowarElvesToken() {
super("Llanowar Elves", "1/1 green Elf Druid creature token named Llanowar Elves with \"{T}: Add {G} to your mana pool.\"");
super("Llanowar Elves", "1/1 green Elf Druid creature token named Llanowar Elves with \"{T}: Add {G}.\"");
this.setOriginalExpansionSetCode("FUT");
cardType.add(CardType.CREATURE);
color.setGreen(true);