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

Merge remote-tracking branch 'magefree/master'

Browse source
This commit is contained in:
Samuel Sandeen 2016-07-24 08:23:29 -04:00
commit 5afef16f6f
5 changed files with 51 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 13;
public final static String MAGE_VERSION_MINOR_PATCH = "v2";
public final static String MAGE_VERSION_MINOR_PATCH = "v3";
public final static String MAGE_VERSION_INFO = "";
private final int major;

15
Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java
View file

@ -77,6 +77,11 @@ public class SpellsCostReductionAllEffect extends CostModificationEffectImpl {
this.upTo = effect.upTo;
}
@Override
public void init(Ability source, Game game) {
super.init(source, game);
}
@Override
public boolean apply(Game game, Ability source, Ability abilityToModify) {
if (upTo) {
@ -109,16 +114,6 @@ public class SpellsCostReductionAllEffect extends CostModificationEffectImpl {
return true;
}
/**
* Overwrite this in effect that inherits from this
*
* @param source
* @param game
*/
protected void setRuntimeData(Ability source, Game game) {
}
/**
* Overwrite this in effect that inherits from this
*

9
Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllOfChosenSubtypeEffect.java
View file

@ -16,15 +16,12 @@ import mage.game.Game;
*/
public class SpellsCostReductionAllOfChosenSubtypeEffect extends SpellsCostReductionAllEffect {
String subtype = null;
public SpellsCostReductionAllOfChosenSubtypeEffect(FilterCard filter, int amount) {
super(filter, amount);
}
public SpellsCostReductionAllOfChosenSubtypeEffect(final SpellsCostReductionAllOfChosenSubtypeEffect effect) {
super(effect);
this.subtype = effect.subtype;
}
@Override
@ -34,15 +31,11 @@ public class SpellsCostReductionAllOfChosenSubtypeEffect extends SpellsCostReduc
@Override
protected boolean selectedByRuntimeData(Card card, Ability source, Game game) {
String subtype = (String) game.getState().getValue(source.getSourceId() + "_type");
if (subtype != null) {
return card.hasSubtype(subtype);
}
return false;
}
@Override
protected void setRuntimeData(Ability source, Game game) {
subtype = (String) game.getState().getValue(source.getSourceId() + "_type");
}
}

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

@ -63,7 +63,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 43;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 53;
private static final long CARD_CONTENT_VERSION = 54;
private final Random random = new Random();
private Dao<CardInfo, Object> cardDao;

3
Utils/release/getting_implemented_cards.txt
View file

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