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

Fix Conspiracy removing types without choice for new one (#6017)

Browse Source 
* Skip incomplete overwrite

* Fix NPE for Unhaunting
This commit is contained in:
tool4ever
2024-08-30 19:13:49 +02:00
committed by GitHub
parent cadf278871
commit 080d347199
7 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/ForgeScript.java
View File

@@ -35,7 +35,6 @@ public class ForgeScript {
public static boolean cardStateHasProperty(CardState cardState, String property, Player sourceController,
Card source, CardTraitBase spellAbility) {
boolean withSource = property.endsWith("Source");
final ColorSet colors;
if (withSource && StaticAbilityColorlessDamageSource.colorlessDamageSource(cardState)) {
@@ -53,7 +52,7 @@ public class ForgeScript {
int desiredColor = MagicColor.fromName(colorName);
boolean hasColor = colors.hasAnyColor(desiredColor);
return mustHave == hasColor;
} else if (property.contains("Colorless")) { // ... Card is colorless
} else if (property.contains("Colorless")) {
boolean non = property.startsWith("non");
return non != colors.isColorless();
} else if (property.startsWith("MultiColor")) {
@@ -72,7 +71,7 @@ public class ForgeScript {
return false;
} else if (property.startsWith("AllColors")) {
return colors.isAllColors();
} else if (property.startsWith("MonoColor")) { // ... Card is monocolored
} else if (property.startsWith("MonoColor")) {
return colors.isMonoColor();
} else if (property.startsWith("ChosenColor")) {
return source.hasChosenColor() && colors.hasAnyColor(MagicColor.fromName(source.getChosenColor()));

2
forge-game/src/main/java/forge/game/ability/effects/HauntEffect.java
View File

@@ -14,7 +14,7 @@ public class HauntEffect extends SpellAbilityEffect {
@Override
public void resolve(SpellAbility sa) {
Card host = sa.getHostCard();
if (host.isPermanent()) {
if (host.isPermanent() && sa.hasTriggeringObject(AbilityKey.NewCard)) {
// get new version instead of battlefield lki
host = (Card) sa.getTriggeringObject(AbilityKey.NewCard);
}

2
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -1843,6 +1843,7 @@ public class Player extends GameEntity implements Comparable<Player> {
lastDrawnCard = c;
return lastDrawnCard;
}
public final Card getRingBearer() {
return ringBearer;
}
@@ -1865,6 +1866,7 @@ public class Player extends GameEntity implements Comparable<Player> {
ringBearer.setRingBearer(false);
ringBearer = null;
}
public final String getNamedCard() {
return namedCard;
}

50
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -422,26 +422,30 @@ public final class StaticAbilityContinuous {
if (params.containsKey("AddAllCreatureTypes")) {
addAllCreatureTypes = true;
}
if (params.containsKey("RemoveSuperTypes")) {
remove.add(RemoveType.SuperTypes);
}
if (params.containsKey("RemoveCardTypes")) {
remove.add(RemoveType.CardTypes);
}
if (params.containsKey("RemoveSubTypes")) {
remove.add(RemoveType.SubTypes);
}
if (params.containsKey("RemoveLandTypes")) {
remove.add(RemoveType.LandTypes);
}
if (params.containsKey("RemoveCreatureTypes")) {
remove.add(RemoveType.CreatureTypes);
}
if (params.containsKey("RemoveArtifactTypes")) {
remove.add(RemoveType.ArtifactTypes);
}
if (params.containsKey("RemoveEnchantmentTypes")) {
remove.add(RemoveType.EnchantmentTypes);
// overwrite doesn't work without new value (e.g. Conspiracy missing choice)
if (addTypes == null || !addTypes.isEmpty()) {
if (params.containsKey("RemoveSuperTypes")) {
remove.add(RemoveType.SuperTypes);
}
if (params.containsKey("RemoveCardTypes")) {
remove.add(RemoveType.CardTypes);
}
if (params.containsKey("RemoveSubTypes")) {
remove.add(RemoveType.SubTypes);
}
if (params.containsKey("RemoveLandTypes")) {
remove.add(RemoveType.LandTypes);
}
if (params.containsKey("RemoveCreatureTypes")) {
remove.add(RemoveType.CreatureTypes);
}
if (params.containsKey("RemoveArtifactTypes")) {
remove.add(RemoveType.ArtifactTypes);
}
if (params.containsKey("RemoveEnchantmentTypes")) {
remove.add(RemoveType.EnchantmentTypes);
}
}
}
@@ -510,7 +514,7 @@ public final class StaticAbilityContinuous {
// modify players
for (final Player p : affectedPlayers) {
// add keywords
if (addKeywords != null) {
if (addKeywords != null && !addKeywords.isEmpty()) {
p.addChangedKeywords(addKeywords, removeKeywords, se.getTimestamp(), stAb.getId());
}
@@ -718,7 +722,7 @@ public final class StaticAbilityContinuous {
}
// add keywords
if (addKeywords != null || removeKeywords != null || removeAllAbilities) {
if ((addKeywords != null && !addKeywords.isEmpty()) || removeKeywords != null || removeAllAbilities) {
List<String> newKeywords = null;
if (addKeywords != null) {
newKeywords = Lists.newArrayList(addKeywords);
@@ -876,7 +880,7 @@ public final class StaticAbilityContinuous {
}
// add Types
if (addTypes != null || removeTypes != null || addAllCreatureTypes || !remove.isEmpty()) {
if ((addTypes != null && !addTypes.isEmpty()) || (removeTypes != null && !removeTypes.isEmpty()) || addAllCreatureTypes || !remove.isEmpty()) {
affectedCard.addChangedCardTypes(addTypes, removeTypes, addAllCreatureTypes, remove,
se.getTimestamp(), stAb.getId(), true, stAb.hasParam("CharacteristicDefining"));
}