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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2021-10-11 21:42:38 +02:00
parent 1280cb384a
commit 091cb077e9
4 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2879,7 +2879,7 @@ public class ComputerUtil {
// no life gain is not negative // no life gain is not negative
return false; return false;
} else if (Iterables.any(list, CardTraitPredicates.hasParam("AiLogic", "LoseLife"))) { } else if (Iterables.any(list, CardTraitPredicates.hasParam("AiLogic", "LoseLife"))) {
// lose life is only negagive is the player can lose life // lose life is only negative is the player can lose life
return player.canLoseLife(); return player.canLoseLife();
} else if (Iterables.any(list, CardTraitPredicates.hasParam("AiLogic", "LichDraw"))) { } else if (Iterables.any(list, CardTraitPredicates.hasParam("AiLogic", "LichDraw"))) {
// if it would draw more cards than player has, then its negative // if it would draw more cards than player has, then its negative

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

@@ -2375,7 +2375,6 @@ public class ComputerUtilCombat {
repParams.put(AbilityKey.DamageSource, attacker); repParams.put(AbilityKey.DamageSource, attacker);
repParams.put(AbilityKey.DamageAmount, damage); repParams.put(AbilityKey.DamageAmount, damage);
repParams.put(AbilityKey.IsCombat, true); repParams.put(AbilityKey.IsCombat, true);
repParams.put(AbilityKey.Prevention, true);
List<ReplacementEffect> list = game.getReplacementHandler().getReplacementList( List<ReplacementEffect> list = game.getReplacementHandler().getReplacementList(
ReplacementType.DamageDone, repParams, ReplacementLayer.Other); ReplacementType.DamageDone, repParams, ReplacementLayer.Other);

3
forge-game/src/main/java/forge/game/ability/AbilityKey.java
View File

@@ -41,7 +41,6 @@ public enum AbilityKey {
CounteredSA("CounteredSA"), CounteredSA("CounteredSA"),
CounterNum("CounterNum"), CounterNum("CounterNum"),
CounterMap("CounterMap"), CounterMap("CounterMap"),
CounterTable("CounterTable"),
CounterType("CounterType"), CounterType("CounterType"),
Crew("Crew"), Crew("Crew"),
CumulativeUpkeepPaid("CumulativeUpkeepPaid"), CumulativeUpkeepPaid("CumulativeUpkeepPaid"),
@@ -103,8 +102,6 @@ public enum AbilityKey {
Phase("Phase"), Phase("Phase"),
Player("Player"), Player("Player"),
PreventedAmount("PreventedAmount"), PreventedAmount("PreventedAmount"),
PreventMap("PreventMap"),
Prevention("Prevention"),
Produced("Produced"), Produced("Produced"),
Regeneration("Regeneration"), Regeneration("Regeneration"),
ReplacementEffect("ReplacementEffect"), ReplacementEffect("ReplacementEffect"),

1
forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
View File

@@ -175,7 +175,6 @@ public class ReplacementHandler {
final Card c = preList.get(crd); final Card c = preList.get(crd);
for (final ReplacementEffect replacementEffect : c.getReplacementEffects()) { for (final ReplacementEffect replacementEffect : c.getReplacementEffects()) {
// Use "CheckLKIZone" parameter to test for effects that care abut where the card was last (e.g. Kalitas, Traitor of Ghet // Use "CheckLKIZone" parameter to test for effects that care abut where the card was last (e.g. Kalitas, Traitor of Ghet
// getting hit by mass removal should still produce tokens). // getting hit by mass removal should still produce tokens).
Zone cardZone = "True".equals(replacementEffect.getParam("CheckSelfLKIZone")) ? game.getChangeZoneLKIInfo(c).getLastKnownZone() : game.getZoneOf(c); Zone cardZone = "True".equals(replacementEffect.getParam("CheckSelfLKIZone")) ? game.getChangeZoneLKIInfo(c).getLastKnownZone() : game.getZoneOf(c);