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

- Removing triggers CombatDamageDoneOnce/DealtCombatDamageOnce (no longer needed, superseded by DamageDoneOnce/DamageDealtOnce).

Browse Source
This commit is contained in:
Agetian
2017-09-29 16:40:40 +00:00
parent a17663655b
commit e276950caa
5 changed files with 1 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -715,7 +715,6 @@ forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java -text
forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java svneol=native#text/plain
forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java -text svneol=unset#text/plain
forge-game/src/main/java/forge/game/trigger/TriggerClashed.java svneol=native#text/plain
forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java -text
forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java svneol=native#text/plain
forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java -text
forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java -text
@@ -727,7 +726,6 @@ forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java svneol=native
forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java -text svneol=unset#text/plain
forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java -text svneol=unset#text/plain
forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java -text svneol=unset#text/plain
forge-game/src/main/java/forge/game/trigger/TriggerDealtCombatDamageOnce.java -text
forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java -text
forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java -text
forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java svneol=native#text/plain

35
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -804,45 +804,12 @@ public class Combat {
c.clearAssignedDamage();
}
// Run triggers
for (final GameEntity ge : dealtDamageTo.columnKeySet()) {
// TODO find better way to get the sum (use streams once Java 8 is OK on Android?)
int totalDmg = 0;
for (Integer dmgEntry : dealtDamageTo.column(ge).values()) {
totalDmg += dmgEntry;
}
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("DamageSources", dealtDamageTo.column(ge).keySet());
runParams.put("DamageAmount", totalDmg);
runParams.put("DamageTarget", ge);
ge.getGame().getTriggerHandler().runTrigger(TriggerType.CombatDamageDoneOnce, runParams, false);
}
preventMap.triggerPreventDamage(true);
// This was deeper before, but that resulted in the stack entry acting like before.
// Run the trigger to deal combat damage once
// LifeLink for Combat Damage at this place
dealtDamageTo.triggerDamageDoneOnce(true);
// when ... deals combat damage to one or more
for (final Card damageSource : dealtDamageTo.rowKeySet()) {
final Map<String, Object> runParams = Maps.newHashMap();
Map<GameEntity, Integer> row = dealtDamageTo.row(damageSource);
// TODO find better way to get the sum
int dealtDamage = 0;
for (Integer i : row.values()) {
dealtDamage += i;
}
runParams.put("DamageSource", damageSource);
runParams.put("DamageTargets", row.keySet());
runParams.put("DamageAmount", dealtDamage);
damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DealtCombatDamageOnce, runParams, false);
}
dealtDamageTo.clear();
}

96
forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java
View File

@@ -1,96 +0,0 @@
/*
* Forge: Play Magic: the Gathering.
* Copyright (C) 2011 Forge Team
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.game.trigger;
import forge.game.GameEntity;
import forge.game.card.Card;
import forge.game.spellability.SpellAbility;
import java.util.Set;
/**
* <p>
* Trigger_DamageDone class.
* </p>
*
* @author Forge
* @version $Id: TriggerDamageDone.java 21390 2013-05-08 07:44:50Z Max mtg $
*/
public class TriggerCombatDamageDoneOnce extends Trigger {
/**
* <p>
* Constructor for TriggerCombatDamageDoneOnc.
* </p>
*
* @param params
* a {@link java.util.HashMap} object.
* @param host
* a {@link forge.game.card.Card} object.
* @param intrinsic
* the intrinsic
*/
public TriggerCombatDamageDoneOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
super(params, host, intrinsic);
}
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override
public final boolean performTest(final java.util.Map<String, Object> runParams2) {
final Set<Card> srcs = (Set<Card>) runParams2.get("DamageSources");
final GameEntity tgt = (GameEntity) runParams2.get("DamageTarget");
if (this.mapParams.containsKey("ValidSource")) {
boolean valid = false;
for (Card c : srcs) {
if (c.isValid(this.mapParams.get("ValidSource").split(","), this.getHostCard().getController(),this.getHostCard(), null)) {
valid = true;
}
}
if (!valid) {
return false;
}
}
if (this.mapParams.containsKey("ValidTarget")) {
if (!matchesValid(tgt, this.mapParams.get("ValidTarget").split(","), this.getHostCard())) {
return false;
}
}
return true;
}
/** {@inheritDoc} */
@Override
public final void setTriggeringObjects(final SpellAbility sa) {
sa.setTriggeringObject("Sources", this.getRunParams().get("DamageSources"));
sa.setTriggeringObject("Target", this.getRunParams().get("DamageTarget"));
sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
}
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
//sb.append("Sources: ").append(sa.getTriggeringObject("Sources")).append(", "); // FIXME: why does this end up empty at this point?
sb.append("Target: ").append(sa.getTriggeringObject("Target")).append(", ");
sb.append("Damage: ").append(sa.getTriggeringObject("DamageAmount"));
return sb.toString();
}
}

114
forge-game/src/main/java/forge/game/trigger/TriggerDealtCombatDamageOnce.java
View File

@@ -1,114 +0,0 @@
/*
* Forge: Play Magic: the Gathering.
* Copyright (C) 2011 Forge Team
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge.game.trigger;
import forge.game.GameEntity;
import forge.game.card.Card;
import forge.game.spellability.SpellAbility;
import forge.util.Expressions;
import java.util.Set;
/**
* <p>
* Trigger_DamageDone class.
* </p>
*
* @author Forge
* @version $Id: TriggerDamageDone.java 21390 2013-05-08 07:44:50Z Max mtg $
*/
public class TriggerDealtCombatDamageOnce extends Trigger {
/**
* <p>
* Constructor for TriggerCombatDamageDoneOnc.
* </p>
*
* @param params
* a {@link java.util.HashMap} object.
* @param host
* a {@link forge.game.card.Card} object.
* @param intrinsic
* the intrinsic
*/
public TriggerDealtCombatDamageOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
super(params, host, intrinsic);
}
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override
public final boolean performTest(final java.util.Map<String, Object> runParams2) {
final Card srcs = (Card) runParams2.get("DamageSource");
final Set<GameEntity> tgt = (Set<GameEntity>) runParams2.get("DamageTargets");
if (this.mapParams.containsKey("ValidTarget")) {
boolean valid = false;
for (GameEntity c : tgt) {
if (c.isValid(this.mapParams.get("ValidTarget").split(","), this.getHostCard().getController(),this.getHostCard(), null)) {
valid = true;
}
}
if (!valid) {
return false;
}
}
if (this.mapParams.containsKey("ValidSource")) {
if (!matchesValid(srcs, this.mapParams.get("ValidSource").split(","), this.getHostCard())) {
return false;
}
}
if (this.mapParams.containsKey("DamageAmount")) {
final String fullParam = this.mapParams.get("DamageAmount");
final String operator = fullParam.substring(0, 2);
final int operand = Integer.parseInt(fullParam.substring(2));
final int actualAmount = (Integer) runParams2.get("DamageAmount");
if (!Expressions.compare(actualAmount, operator, operand)) {
return false;
}
System.out.print("DealtCombatDamageOnce Amount Operator: ");
System.out.println(operator);
System.out.print("DealtCombatDamageOnce Amount Operand: ");
System.out.println(operand);
}
return true;
}
/** {@inheritDoc} */
@Override
public final void setTriggeringObjects(final SpellAbility sa) {
sa.setTriggeringObject("Source", this.getRunParams().get("DamageSource"));
sa.setTriggeringObject("Targets", this.getRunParams().get("DamageTargets"));
sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
}
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
sb.append("Damaged: ").append(sa.getTriggeringObject("Targets")).append(", ");
sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
return sb.toString();
}
}

2
forge-game/src/main/java/forge/game/trigger/TriggerType.java
View File

@@ -32,7 +32,6 @@ public enum TriggerType {
ChangesZone(TriggerChangesZone.class),
ChangesZoneAll(TriggerChangesZoneAll.class),
Clashed(TriggerClashed.class),
CombatDamageDoneOnce(TriggerCombatDamageDoneOnce.class),
CounterAdded(TriggerCounterAdded.class),
CounterAddedOnce(TriggerCounterAddedOnce.class),
Countered(TriggerCountered.class),
@@ -44,7 +43,6 @@ public enum TriggerType {
DamageDoneOnce(TriggerDamageDoneOnce.class),
DamagePrevented(TriggerDamagePrevented.class),
DamagePreventedOnce(TriggerDamagePreventedOnce.class),
DealtCombatDamageOnce(TriggerDealtCombatDamageOnce.class),
Destroyed(TriggerDestroyed.class),
Devoured(TriggerDevoured.class),
Discarded(TriggerDiscarded.class),