remove MagicFadeVanishCounterTrigger from card code, replace with vanishing ability
parent
91c26cf612
commit
864c8e077f
22
Makefile
22
Makefile
|
@ -38,17 +38,6 @@ themes: \
|
||||||
cards_diff: $(MAG)
|
cards_diff: $(MAG)
|
||||||
for i in `hg stat -q src/magic/card release/Magarena/scripts | cut -d' ' -f2 | sort -t'/' -k4`; do hg diff $$i; done | flip -u - > $@
|
for i in `hg stat -q src/magic/card release/Magarena/scripts | cut -d' ' -f2 | sort -t'/' -k4`; do hg diff $$i; done | flip -u - > $@
|
||||||
|
|
||||||
code_to_remove: $(MAG)
|
|
||||||
cat src/magic/card/*.java | sed 's/\s\+//g' | sed 's/(.*)/(...)/g' | sort | uniq -c | sort -n | grep publicstaticfinal | grep ");" > $@
|
|
||||||
|
|
||||||
casts: $(MAG)
|
|
||||||
grep -n "([A-Za-z]\+)[A-Za-z]\+" -r src/ > $@
|
|
||||||
flip -u $@
|
|
||||||
|
|
||||||
nulls: $(MAG)
|
|
||||||
grep -n "null" -r src/ > $@
|
|
||||||
flip -u $@
|
|
||||||
|
|
||||||
findbugs_warnings.txt: $(MAG)
|
findbugs_warnings.txt: $(MAG)
|
||||||
~/App/findbugs/bin/findbugs \
|
~/App/findbugs/bin/findbugs \
|
||||||
-textui \
|
-textui \
|
||||||
|
@ -404,6 +393,17 @@ find_event_data: scripts/check_data.awk
|
||||||
find_literals:
|
find_literals:
|
||||||
grep "\"" src/magic/card/* | awk -f scripts/check_literals.awk
|
grep "\"" src/magic/card/* | awk -f scripts/check_literals.awk
|
||||||
|
|
||||||
|
find_single_line_card_code: $(MAG)
|
||||||
|
cat src/magic/card/*.java | sed 's/\s\+//g' | sed 's/(.*)/(...)/g' | sort | uniq -c | sort -n | grep publicstaticfinal | grep ");" > $@
|
||||||
|
|
||||||
|
find_casts: $(MAG)
|
||||||
|
grep -n "([A-Za-z]\+)[A-Za-z]\+" -r src/ > $@
|
||||||
|
flip -u $@
|
||||||
|
|
||||||
|
find_nulls: $(MAG)
|
||||||
|
grep -n "null" -r src/ > $@
|
||||||
|
flip -u $@
|
||||||
|
|
||||||
# meta check
|
# meta check
|
||||||
check: check_aura check_requires_card_code check_script_name
|
check: check_aura check_requires_card_code check_script_name
|
||||||
|
|
||||||
|
|
|
@ -8,5 +8,5 @@ subtype=Wurm
|
||||||
cost={1}{G}{G}
|
cost={1}{G}{G}
|
||||||
pt=6/6
|
pt=6/6
|
||||||
timing=main
|
timing=main
|
||||||
ability=kicker {4} it enters the battlefield with three additional time counters on it
|
ability=vanishing 2,kicker {4} it enters the battlefield with three additional time counters on it
|
||||||
requires_card_code
|
requires_card_code
|
||||||
|
|
|
@ -7,4 +7,5 @@ type=Creature
|
||||||
subtype=Elemental
|
subtype=Elemental
|
||||||
cost={2}{U}
|
cost={2}{U}
|
||||||
timing=main
|
timing=main
|
||||||
|
ability=vanishing 0
|
||||||
requires_card_code
|
requires_card_code
|
||||||
|
|
|
@ -10,21 +10,20 @@ import magic.model.trigger.MagicFadeVanishCounterTrigger;
|
||||||
import magic.model.trigger.MagicWhenComesIntoPlayTrigger;
|
import magic.model.trigger.MagicWhenComesIntoPlayTrigger;
|
||||||
|
|
||||||
public class Ravaging_Riftwurm {
|
public class Ravaging_Riftwurm {
|
||||||
public static final MagicFadeVanishCounterTrigger T = new MagicFadeVanishCounterTrigger("time");
|
|
||||||
|
|
||||||
public static final MagicWhenComesIntoPlayTrigger T2 = new MagicWhenComesIntoPlayTrigger() {
|
public static final MagicWhenComesIntoPlayTrigger T2 = new MagicWhenComesIntoPlayTrigger() {
|
||||||
@Override
|
@Override
|
||||||
public MagicEvent executeTrigger(
|
public MagicEvent executeTrigger(
|
||||||
final MagicGame game,
|
final MagicGame game,
|
||||||
final MagicPermanent permanent,
|
final MagicPermanent permanent,
|
||||||
final MagicPlayer player) {
|
final MagicPlayer player) {
|
||||||
final int amount = permanent.isKicked() ? 5 : 2;
|
if (permanent.isKicked()) {
|
||||||
game.doAction(new MagicChangeCountersAction(
|
game.doAction(new MagicChangeCountersAction(
|
||||||
permanent,
|
permanent,
|
||||||
MagicCounterType.Charge,
|
MagicCounterType.Charge,
|
||||||
amount,
|
3,
|
||||||
true
|
true
|
||||||
));
|
));
|
||||||
|
}
|
||||||
return MagicEvent.NONE;
|
return MagicEvent.NONE;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,8 +22,6 @@ public class Tidewalker {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final MagicFadeVanishCounterTrigger T1 = new MagicFadeVanishCounterTrigger("time");
|
|
||||||
|
|
||||||
public static final MagicWhenComesIntoPlayTrigger T2 = new MagicWhenComesIntoPlayTrigger() {
|
public static final MagicWhenComesIntoPlayTrigger T2 = new MagicWhenComesIntoPlayTrigger() {
|
||||||
@Override
|
@Override
|
||||||
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
|
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
|
||||||
|
|
|
@ -189,7 +189,9 @@ public enum MagicAbility {
|
||||||
Vanishing("vanishing",-20) {
|
Vanishing("vanishing",-20) {
|
||||||
public void addAbilityImpl(final MagicCardDefinition card, final String arg) {
|
public void addAbilityImpl(final MagicCardDefinition card, final String arg) {
|
||||||
final int n = Integer.parseInt(arg);
|
final int n = Integer.parseInt(arg);
|
||||||
card.add(new MagicComesIntoPlayWithCounterTrigger(MagicCounterType.Charge,"time",n));
|
if (n > 0) {
|
||||||
|
card.add(new MagicComesIntoPlayWithCounterTrigger(MagicCounterType.Charge,"time",n));
|
||||||
|
}
|
||||||
card.add(new MagicFadeVanishCounterTrigger("time"));
|
card.add(new MagicFadeVanishCounterTrigger("time"));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue