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

Merge branch 'fix' into 'master'

Browse Source 
Various fixes

See merge request core-developers/forge!3434
This commit is contained in:
Michael Kamensky
2020-11-26 18:01:27 +00:00
parent 59270db775 6e06625b4c
commit b43f5544a2
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/AbilityFactory.java
View File

@@ -455,7 +455,7 @@ public final class AbilityFactory {
Map<String, String> leftMap = Maps.newHashMap(leftAbility.getMapParams());
AbilityRecordType leftType = AbilityRecordType.getRecordType(leftMap);
ApiType leftApi = leftType.getApiTypeOf(leftMap);
leftMap.put("StackDecription", leftMap.get("SpellDescription"));
leftMap.put("StackDescription", leftMap.get("SpellDescription"));
leftMap.put("SpellDescription", "Fuse (you may cast both halves of this card from your hand).");
leftMap.put("ActivationZone", "Hand");
@@ -465,7 +465,7 @@ public final class AbilityFactory {
AbilityRecordType rightType = AbilityRecordType.getRecordType(leftMap);
ApiType rightApi = leftType.getApiTypeOf(rightMap);
rightMap.put("StackDecription", rightMap.get("SpellDescription"));
rightMap.put("StackDescription", rightMap.get("SpellDescription"));
rightMap.put("SpellDescription", "");
Cost totalCost = parseAbilityCost(leftState, leftMap, leftType);