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

- Mogg War Marshal and Goblin Marshal shouldn't produce flying tokens anymore, also their creature type was "Goblin " (with an extra space).

Browse Source 
- Lifelink / Guilty Conscience should work now on cards like Sparksmith and Goblin Artillery.
This commit is contained in:
jendave
2011-08-06 03:30:03 +00:00
parent 750cb63448
commit 61e6617bf9
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/forge/CardFactoryUtil.java
View File

@@ -2523,7 +2523,8 @@ public class CardFactoryUtil {
// 1/10 // 1/10
if(d[0].contains("DamageTgtC")) AllZone.GameAction.addDamage(TgtC, Src, X); 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("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); if(d[0].contains("GainLife")) AllZone.GameAction.addLife(dbPlayer, X);

2
src/forge/CardFactory_Creatures.java
View File

@@ -13002,7 +13002,7 @@ public class CardFactory_Creatures {
void makeToken() { void makeToken() {
CardFactoryUtil.makeToken("Goblin", "R 1 1 Goblin", card, "R", new String[] { 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() { Command intoPlayDestroy = new Command() {

12
src/forge/GameAction.java
View File

@@ -1459,6 +1459,18 @@ public class GameAction {
getPlayerLife(player).subtractLife(life); 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) { public void addDamage(String player, int damage) {
// place holder for future damage modification rules (prevention?) // place holder for future damage modification rules (prevention?)