external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Maulfist Revolutionary and Skyship Plunderer

Browse Source
This commit is contained in:
Sol
2017-01-11 02:14:43 +00:00
parent 4bb6b3144e
commit 1fa77e04e8
4 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -16606,6 +16606,7 @@ forge-gui/res/cardsfolder/upcoming/lifecraft_cavalry.txt -text
forge-gui/res/cardsfolder/upcoming/lifecrafters_bestiary.txt -text
forge-gui/res/cardsfolder/upcoming/lifecrafters_gift.txt -text
forge-gui/res/cardsfolder/upcoming/lightning_runner.txt -text
forge-gui/res/cardsfolder/upcoming/maulfist_revolutionary.txt -text
forge-gui/res/cardsfolder/upcoming/mechanized_production.txt -text
forge-gui/res/cardsfolder/upcoming/merchants_dockhand.txt -text
forge-gui/res/cardsfolder/upcoming/metallic_mimic.txt -text
@@ -16652,6 +16653,7 @@ forge-gui/res/cardsfolder/upcoming/shielded_aether_thief.txt -text
forge-gui/res/cardsfolder/upcoming/shipwreck_moray.txt -text
forge-gui/res/cardsfolder/upcoming/siege_modification.txt -text
forge-gui/res/cardsfolder/upcoming/silkweaver_elite.txt -text
forge-gui/res/cardsfolder/upcoming/skyship_plunderer.txt -text
forge-gui/res/cardsfolder/upcoming/solemn_recruit.txt -text
forge-gui/res/cardsfolder/upcoming/spire_of_industry.txt -text
forge-gui/res/cardsfolder/upcoming/spire_patrol.txt -text

18
forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
View File

@@ -90,6 +90,8 @@ public class CountersPutEffect extends SpellAbilityEffect {
String strTyp = sa.getParam("CounterType");
CounterType counterType = null;
boolean existingCounter = strTyp.equals("ExistingCounter");
boolean eachExistingCounter = sa.hasParam("EachExistingCounter");
String amount = sa.getParamOrDefault("CounterNum", "1");
if (!existingCounter) {
try {
@@ -103,7 +105,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
final boolean etbcounter = sa.hasParam("ETB");
final boolean remember = sa.hasParam("RememberCounters");
final boolean rememberCards = sa.hasParam("RememberCards");
int counterAmount = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("CounterNum"), sa);
int counterAmount = AbilityUtils.calculateAmount(sa.getHostCard(), amount, sa);
final int max = sa.hasParam("MaxFromEffect") ? Integer.parseInt(sa.getParam("MaxFromEffect")) : -1;
if (sa.hasParam("UpTo")) {
@@ -142,8 +144,22 @@ public class CountersPutEffect extends SpellAbilityEffect {
if (choices.isEmpty()) {
continue;
}
if (eachExistingCounter) {
for(CounterType ct : choices) {
if (obj instanceof Player) {
((Player) obj).addCounter(ct, counterAmount, true);
}
if (obj instanceof Card) {
((Card) obj).addCounter(ct, counterAmount, true);
}
}
continue;
} else {
counterType = choices.size() == 1 ? choices.get(0) : activator.getController().chooseCounterType(choices, sa, "Select counter type to add");
}
}
if (obj instanceof Card) {

11
forge-gui/res/cardsfolder/upcoming/maulfist_revolutionary.txt Normal file
View File

@@ -0,0 +1,11 @@
Name:Maulfist Revolutionary
ManaCost:1 G G
Types:Creature Human Warrior
PT:3/3
K:Trample
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncrementCounters | TriggerDescription$ When CARDNAME enters the battlefield or dies, for each kind of counter on target permanent or player, give that permanent or player another counter of that kind.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigIncrementCounters | TriggerController$ TriggeredCardController | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or dies, for each kind of counter on target permanent or player, give that permanent or player another counter of that kind.
SVar:TrigIncrementCounters:DB$ PutCounter | ValidTgts$ Permanent,Player | CounterType$ ExistingCounter | EachExistingCounter$ True | CounterNum$ 1
SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/maulfist_revolutionary.jpg
Oracle:Trample\nWhen Maulfist Revolutionary enters the battlefield or dies, for each kind of counter on target permanent or player, give that permanent or player another counter of that kind.

10
forge-gui/res/cardsfolder/upcoming/skyship_plunderer.txt Normal file
View File

@@ -0,0 +1,10 @@
Name:Skyship Plunderer
ManaCost:1 U
Types:Creature Human Rogue
PT:2/1
K:Flying
T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigIncrementCounters | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, for each kind of counter on target permanent or player, give permanent or player another counter of that kind.
SVar:TrigIncrementCounters:DB$ PutCounter | ValidTgts$ Permanent,Player | CounterType$ ExistingCounter | EachExistingCounter$ True | CounterNum$ 1
SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/skyship_plunderer.jpg
Oracle:Flying\nWhenever Skyship Plunderer deals combat damage to a player, for each kind of counter on target permanent or player, give permanent or player another counter of that kind.