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

Merge pull request #2275 from tool4ever/verrak_fix

Browse Source 
Fix Verrak
This commit is contained in:
Anthony Calosa
2023-01-21 08:38:33 +08:00
committed by GitHub
parent 2e53b7019a e0fec88cf2
commit 7610378402
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -128,6 +128,7 @@ public class ComputerUtil {
if (!sa.isCopied()) { if (!sa.isCopied()) {
sa.resetPaidHash(); sa.resetPaidHash();
sa.setPaidLife(0);
} }
sa = GameActionUtil.addExtraKeywordCost(sa); sa = GameActionUtil.addExtraKeywordCost(sa);

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

@@ -1802,11 +1802,6 @@ public class AbilityUtils {
final SpellAbility root = (SpellAbility) sa.getRootAbility().getTriggeringObject(AbilityKey.SpellAbility); final SpellAbility root = (SpellAbility) sa.getRootAbility().getTriggeringObject(AbilityKey.SpellAbility);
return root == null ? 0 : root.getTotalManaSpent(); return root == null ? 0 : root.getTotalManaSpent();
} }
// Count$TriggeredLifeSpent
if (sq[0].equals("TriggeredLifeSpent")) {
final SpellAbility root = (SpellAbility) sa.getRootAbility().getTriggeringObject(AbilityKey.SpellAbility);
return root == null ? 0 : root.getAmountLifePaid();
}
// Count$ManaColorsPaid // Count$ManaColorsPaid
if (sq[0].equals("ManaColorsPaid")) { if (sq[0].equals("ManaColorsPaid")) {

1
forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java
View File

@@ -283,6 +283,7 @@ public class TriggerSpellAbilityCastOrCopy extends Trigger {
} }
sa.setTriggeringObject(AbilityKey.SpellAbilityTargets, saTargets); sa.setTriggeringObject(AbilityKey.SpellAbilityTargets, saTargets);
} }
sa.setTriggeringObject(AbilityKey.LifeAmount, castSA.getAmountLifePaid());
sa.setTriggeringObjectsFrom( sa.setTriggeringObjectsFrom(
runParams, runParams,
AbilityKey.Player, AbilityKey.Player,

2
forge-gui/res/cardsfolder/v/verrak_warped_sengir.txt
View File

@@ -7,5 +7,5 @@ K:Deathtouch
K:Lifelink K:Lifelink
T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | Condition$ LifePaid | TriggerZones$ Battlefield | Execute$ TrigCopySpell | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, if life was paid to activate it, you may pay that much life again. If you do, copy that ability. You may choose new targets for the copy. T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | Condition$ LifePaid | TriggerZones$ Battlefield | Execute$ TrigCopySpell | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, if life was paid to activate it, you may pay that much life again. If you do, copy that ability. You may choose new targets for the copy.
SVar:TrigCopySpell:AB$ CopySpellAbility | Cost$ PayLife<X> | Defined$ TriggeredSpellAbility | MayChooseTarget$ True SVar:TrigCopySpell:AB$ CopySpellAbility | Cost$ PayLife<X> | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
SVar:X:Count$TriggeredLifeSpent SVar:X:TriggerCount$LifeAmount
Oracle:Flying, deathtouch, lifelink\nWhenever you activate an ability that isn't a mana ability, if life was paid to activate it, you may pay that much life again. If you do, copy that ability. You may choose new targets for the copy. Oracle:Flying, deathtouch, lifelink\nWhenever you activate an ability that isn't a mana ability, if life was paid to activate it, you may pay that much life again. If you do, copy that ability. You may choose new targets for the copy.

1
forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
View File

@@ -94,6 +94,7 @@ public class HumanPlaySpellAbility {
if (!ability.isCopied()) { if (!ability.isCopied()) {
ability.resetPaidHash(); ability.resetPaidHash();
ability.setPaidLife(0);
} }
ability = GameActionUtil.addExtraKeywordCost(ability); ability = GameActionUtil.addExtraKeywordCost(ability);