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

Merge branch 'patch' into 'master'

Browse Source 
Fix Kaalia of the Vast

See merge request core-developers/forge!2151
This commit is contained in:
swordshine
2019-09-21 14:44:51 +00:00
parent 455c83a963 0f4c1960d9
commit bc6ab4d0b9
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
View File

@@ -468,7 +468,7 @@ public class ComputerUtilCost {
continue; continue;
try { try {
extraManaNeeded += Integer.parseInt(snem); extraManaNeeded += Integer.parseInt(parts[0]);
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
System.out.println("wrong SpellsNeedExtraMana SVar format on " + c); System.out.println("wrong SpellsNeedExtraMana SVar format on " + c);
} }

3
forge-game/src/main/java/forge/game/trigger/TriggerAttached.java
View File

@@ -73,7 +73,8 @@ public class TriggerAttached extends Trigger {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final void setTriggeringObjects(final SpellAbility sa) { public final void setTriggeringObjects(final SpellAbility sa) {
sa.setTriggeringObjectsFrom(this, AbilityKey.Source, AbilityKey.Target); sa.setTriggeringObject(AbilityKey.Source, getFromRunParams(AbilityKey.AttachSource));
sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.AttachTarget));
} }
@Override @Override

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

@@ -125,10 +125,10 @@ public class TriggerAttacks extends Trigger {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final void setTriggeringObjects(final SpellAbility sa) { public final void setTriggeringObjects(final SpellAbility sa) {
sa.setTriggeringObject(AbilityKey.Defender, getFromRunParams(AbilityKey.Attacked));
sa.setTriggeringObjectsFrom( sa.setTriggeringObjectsFrom(
this, this,
AbilityKey.Attacker, AbilityKey.Attacker,
AbilityKey.Defender,
AbilityKey.Defenders, AbilityKey.Defenders,
AbilityKey.DefendingPlayer AbilityKey.DefendingPlayer
); );

3
forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
View File

@@ -74,7 +74,8 @@ public class TriggerCounterRemovedOnce extends Trigger {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final void setTriggeringObjects(final SpellAbility sa) { public final void setTriggeringObjects(final SpellAbility sa) {
sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Amount); sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
sa.setTriggeringObject(AbilityKey.Amount, getFromRunParams(AbilityKey.CounterAmount));
} }
@Override @Override

4
forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java
View File

@@ -106,7 +106,9 @@ public class TriggerDamageDealtOnce extends Trigger {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final void setTriggeringObjects(final SpellAbility sa) { public final void setTriggeringObjects(final SpellAbility sa) {
sa.setTriggeringObjectsFrom(this, AbilityKey.Source, AbilityKey.Targets, AbilityKey.DamageAmount); sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount);
sa.setTriggeringObject(AbilityKey.Source, getFromRunParams(AbilityKey.DamageSource));
sa.setTriggeringObject(AbilityKey.Targets, getFromRunParams(AbilityKey.DamageTargets));
} }
@Override @Override