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

DamageDealBaseEffect: add base Class for Damage Effects: add replaceDying

Browse Source
This commit is contained in:
Hanmac
2017-06-10 16:38:25 +00:00
parent 580aed115a
commit 7519e22d67
8 changed files with 149 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -386,6 +386,7 @@ forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.ja
forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java -text
forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java -text
forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java -text
forge-game/src/main/java/forge/game/ability/effects/DamageBaseEffect.java -text svneol=unset#text/plain
forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java -text
forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java -text
forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java -text

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

@@ -264,4 +264,22 @@ public abstract class SpellAbilityEffect {
trig.setOverridingAbility(AbilityFactory.getAbility(trigSA, card));
card.addTrigger(trig);
}
protected static void addForgetOnMovedTrigger(final Card card, final String zone) {
String trig = "Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ " + zone + " | Destination$ Any | TriggerZones$ Command | Static$ True";
String effect = "DB$ Pump | ForgetObjects$ TriggeredCard";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, card, true);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
final Trigger addedTrigger = card.addTrigger(parsedTrigger);
addedTrigger.setIntrinsic(true);
}
protected static void addExileOnMovedTrigger(final Card card, final String zone) {
String trig = "Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ " + zone + " | Destination$ Any | TriggerZones$ Command | Static$ True";
String effect = "DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, card, true);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
final Trigger addedTrigger = card.addTrigger(parsedTrigger);
addedTrigger.setIntrinsic(true);
}
}

11
forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java
View File

@@ -3,7 +3,6 @@ package forge.game.ability.effects;
import forge.game.Game;
import forge.game.GameEntity;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardCollectionView;
@@ -15,7 +14,10 @@ import forge.game.zone.ZoneType;
import java.util.List;
public class DamageAllEffect extends SpellAbilityEffect {
public class DamageAllEffect extends DamageBaseEffect {
/* (non-Javadoc)
* @see forge.game.ability.SpellAbilityEffect#getStackDescription(forge.game.spellability.SpellAbility)
*/
@Override
protected String getStackDescription(SpellAbility sa) {
final StringBuilder sb = new StringBuilder();
@@ -44,6 +46,9 @@ public class DamageAllEffect extends SpellAbilityEffect {
return sb.toString();
}
/* (non-Javadoc)
* @see forge.game.ability.SpellAbilityEffect#resolve(forge.game.spellability.SpellAbility)
*/
@Override
public void resolve(SpellAbility sa) {
final List<Card> definedSources = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DamageSource"), sa);
@@ -107,5 +112,7 @@ public class DamageAllEffect extends SpellAbilityEffect {
preventMap.triggerPreventDamage(false);
damageMap.dealLifelinkDamage();
replaceDying(sa);
}
}

97
forge-game/src/main/java/forge/game/ability/effects/DamageBaseEffect.java Normal file
View File

@@ -0,0 +1,97 @@
package forge.game.ability.effects;
import forge.GameCommand;
import forge.game.Game;
import forge.game.ability.AbilityFactory;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.player.Player;
import forge.game.replacement.ReplacementEffect;
import forge.game.replacement.ReplacementHandler;
import forge.game.replacement.ReplacementLayer;
import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType;
abstract public class DamageBaseEffect extends SpellAbilityEffect {
static void replaceDying(final SpellAbility sa) {
if (sa.hasParam("ReplaceDyingDefined")) {
if (sa.hasParam("ReplaceDyingCondition")) {
// currently there is only one with Kicker
final String condition = sa.getParam("ReplaceDyingCondition");
if ("Kicker".equals(condition)) {
if (!sa.isKicked()) {
return;
}
}
}
final Card host = sa.getHostCard();
final Player controller = sa.getActivatingPlayer();
final Game game = host.getGame();
String zone = sa.getParamOrDefault("ReplaceDyingZone", "Exile");
CardCollection cards = AbilityUtils.getDefinedCards(host, sa.getParam("ReplaceDyingDefined"), sa);
// no cards, no need for Effect
if (cards.isEmpty()) {
return;
}
// build an Effect with that infomation
String name = host.getName() + "'s Effect";
final Card eff = new Card(game.nextCardId(), game);
eff.setTimestamp(game.getNextTimestamp());
eff.setName(name);
eff.addType("Effect");
eff.setToken(true); // Set token to true, so when leaving play it gets nuked
eff.setOwner(controller);
eff.setImageKey(host.getImageKey());
eff.setColor(host.determineColor().getColor());
eff.setImmutable(true);
eff.setEffectSource(host);
eff.addRemembered(cards);
String repeffstr = "Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Graveyard " +
"| Description$ If the creature would die this turn, exile it instead.";
String effect = "DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ " + zone;
ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, eff, true);
re.setLayer(ReplacementLayer.Other);
re.setOverridingAbility(AbilityFactory.getAbility(effect, eff));
eff.addReplacementEffect(re);
// Add forgot trigger
addForgetOnMovedTrigger(eff, "Battlefield");
// Copy text changes
if (sa.isIntrinsic()) {
eff.copyChangedTextFrom(host);
}
final GameCommand endEffect = new GameCommand() {
private static final long serialVersionUID = -5861759814760561373L;
@Override
public void run() {
game.getAction().exile(eff, null);
}
};
game.getEndOfTurn().addUntil(endEffect);
eff.updateStateForView();
// TODO: Add targeting to the effect so it knows who it's dealing with
game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
game.getAction().moveTo(ZoneType.Command, eff, sa);
game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
}
}
}

12
forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
View File

@@ -3,7 +3,6 @@ package forge.game.ability.effects;
import forge.game.Game;
import forge.game.GameObject;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardDamageMap;
@@ -18,10 +17,10 @@ import java.util.Map.Entry;
import com.google.common.collect.Iterables;
public class DamageDealEffect extends SpellAbilityEffect {
public class DamageDealEffect extends DamageBaseEffect {
/* (non-Javadoc)
* @see forge.card.abilityfactory.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility)
* @see forge.game.ability.SpellAbilityEffect#getStackDescription(forge.game.spellability.SpellAbility)
*/
@Override
protected String getStackDescription(SpellAbility sa) {
@@ -65,6 +64,9 @@ public class DamageDealEffect extends SpellAbilityEffect {
return sb.toString();
}
/* (non-Javadoc)
* @see forge.game.ability.SpellAbilityEffect#resolve(forge.game.spellability.SpellAbility)
*/
@Override
public void resolve(SpellAbility sa) {
final Card hostCard = sa.getHostCard();
@@ -152,8 +154,10 @@ public class DamageDealEffect extends SpellAbilityEffect {
if (combatDmg) {
game.getCombat().getDamageMap().putAll(damageMap);
} else {
preventMap.triggerPreventDamage(false);
// non combat damage cause lifegain there
damageMap.dealLifelinkDamage();
replaceDying(sa);
}
return;
}
@@ -192,5 +196,7 @@ public class DamageDealEffect extends SpellAbilityEffect {
// non combat damage cause lifegain there
damageMap.dealLifelinkDamage();
}
replaceDying(sa);
}
}

5
forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java
View File

@@ -2,7 +2,6 @@ package forge.game.ability.effects;
import forge.game.GameObject;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardDamageMap;
import forge.game.card.CardFactoryUtil;
@@ -14,7 +13,7 @@ import forge.util.collect.FCollectionView;
import java.util.List;
public class DamageEachEffect extends SpellAbilityEffect {
public class DamageEachEffect extends DamageBaseEffect {
/* (non-Javadoc)
* @see forge.card.abilityfactory.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility)
@@ -123,5 +122,7 @@ public class DamageEachEffect extends SpellAbilityEffect {
preventMap.triggerPreventDamage(false);
damageMap.dealLifelinkDamage();
replaceDying(sa);
}
}

16
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -199,21 +199,9 @@ public class EffectEffect extends SpellAbilityEffect {
}
}
if (sa.hasParam("ForgetOnMoved")) {
String zone = sa.getParam("ForgetOnMoved");
String trig = "Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ " + zone + " | Destination$ Any | TriggerZones$ Command | Static$ True";
String effect = "DB$ Pump | ForgetObjects$ TriggeredCard";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, eff, true);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, eff));
final Trigger addedTrigger = eff.addTrigger(parsedTrigger);
addedTrigger.setIntrinsic(true);
addForgetOnMovedTrigger(eff, sa.getParam("ForgetOnMoved"));
} else if (sa.hasParam("ExileOnMoved")) {
String zone = sa.getParam("ExileOnMoved");
String trig = "Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ " + zone + " | Destination$ Any | TriggerZones$ Command | Static$ True";
String effect = "DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, eff, true);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, eff));
final Trigger addedTrigger = eff.addTrigger(parsedTrigger);
addedTrigger.setIntrinsic(true);
addExileOnMovedTrigger(eff, sa.getParam("ExileOnMoved"));
}
}

14
forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
View File

@@ -5,7 +5,6 @@ import com.google.common.collect.Maps;
import forge.game.Game;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardDamageMap;
import forge.game.spellability.SpellAbility;
@@ -14,8 +13,11 @@ import forge.game.trigger.TriggerType;
import java.util.List;
import java.util.Map;
public class FightEffect extends SpellAbilityEffect {
public class FightEffect extends DamageBaseEffect {
/* (non-Javadoc)
* @see forge.game.ability.SpellAbilityEffect#getStackDescription(forge.game.spellability.SpellAbility)
*/
@Override
protected String getStackDescription(SpellAbility sa) {
final StringBuilder sb = new StringBuilder();
@@ -31,8 +33,9 @@ public class FightEffect extends SpellAbilityEffect {
return sb.toString();
}
/* (non-Javadoc)
* @see forge.card.abilityfactory.SpellEffect#resolve(java.util.Map, forge.card.spellability.SpellAbility)
* @see forge.game.ability.SpellAbilityEffect#resolve(forge.game.spellability.SpellAbility)
*/
@Override
public void resolve(SpellAbility sa) {
@@ -61,6 +64,8 @@ public class FightEffect extends SpellAbilityEffect {
preventMap.triggerPreventDamage(false);
damageMap.dealLifelinkDamage();
replaceDying(sa);
for (Card c : fighters) {
final Map<String, Object> runParams = Maps.newHashMap();
@@ -112,7 +117,8 @@ public class FightEffect extends SpellAbilityEffect {
return fighterList;
}
private void dealDamage(Card source, Card target, boolean fightToughness, CardDamageMap damageMap, CardDamageMap preventMap) {
private void dealDamage(Card source, Card target, boolean fightToughness, CardDamageMap damageMap,
CardDamageMap preventMap) {
final int dmg = fightToughness ? source.getNetToughness() : source.getNetPower();
target.addDamage(dmg, source, damageMap, preventMap);