mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-15 18:28:00 +00:00
- Mogg War Marshal and Goblin Marshal shouldn't produce flying tokens anymore, also their creature type was "Goblin " (with an extra space).
- Lifelink / Guilty Conscience should work now on cards like Sparksmith and Goblin Artillery.
This commit is contained in:
@@ -2523,7 +2523,8 @@ public class CardFactoryUtil {
|
||||
// 1/10
|
||||
if(d[0].contains("DamageTgtC")) AllZone.GameAction.addDamage(TgtC, Src, X);
|
||||
else if(d[0].contains("DamageSelf")) AllZone.GameAction.addDamage(Src, Src, X); // 2/10
|
||||
else if(d[0].contains("Damage")) AllZone.GameAction.addDamage(dbPlayer, X);
|
||||
else if(d[0].contains("Damage")) AllZone.GameAction.addDamage(dbPlayer, X, Src);
|
||||
|
||||
|
||||
|
||||
if(d[0].contains("GainLife")) AllZone.GameAction.addLife(dbPlayer, X);
|
||||
|
||||
@@ -13002,7 +13002,7 @@ public class CardFactory_Creatures {
|
||||
|
||||
void makeToken() {
|
||||
CardFactoryUtil.makeToken("Goblin", "R 1 1 Goblin", card, "R", new String[] {
|
||||
"Creature", "Goblin "}, 1, 1, new String[] {"Flying"});
|
||||
"Creature", "Goblin"}, 1, 1, new String[] {""});
|
||||
}
|
||||
};
|
||||
Command intoPlayDestroy = new Command() {
|
||||
|
||||
@@ -1459,6 +1459,18 @@ public class GameAction {
|
||||
getPlayerLife(player).subtractLife(life);
|
||||
}
|
||||
|
||||
public void addDamage(String player, int damage, Card source) {
|
||||
// place holder for future damage modification rules (prevention?)
|
||||
|
||||
if(source.getKeyword().contains("Lifelink")) GameActionUtil.executeLifeLinkEffects(source, damage);
|
||||
|
||||
CardList cl = CardFactoryUtil.getAurasEnchanting(source, "Guilty Conscience");
|
||||
for(Card c:cl) {
|
||||
GameActionUtil.executeGuiltyConscienceEffects(source, c, damage);
|
||||
}
|
||||
getPlayerLife(player).subtractLife(damage);
|
||||
}
|
||||
|
||||
public void addDamage(String player, int damage) {
|
||||
// place holder for future damage modification rules (prevention?)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user