From 5a5c49229e2824c9d8b4c2709a3edad07d47c00e Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 11 Feb 2020 23:02:46 +0400 Subject: [PATCH] Merge fix --- Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java | 2 +- Mage/src/main/java/mage/util/CardUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java index f0da013898..9d66251def 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java @@ -34,7 +34,7 @@ public interface ManaCosts extends List, ManaCost { } /** - * @param mana mana in strinct like "{2}{R}" or "{2/W}" + * @param mana * @param extractMonoHybridGenericValue for tests only, extract generic mana value from mono hybrid string */ void load(String mana, boolean extractMonoHybridGenericValue); diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 0d437573f7..3101784599 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -107,7 +107,7 @@ public final class CardUtil { if (reduceCount > 0) { int restToReduce = reduceCount; - // first run - priority single option costs (generic) + // first run - priority for single option costs (generic) for (ManaCost manaCost : manaCosts) { if (manaCost instanceof SnowManaCost) { adjustedCost.add(manaCost); @@ -156,7 +156,7 @@ public final class CardUtil { } if (manaCost instanceof MonoHybridManaCost) { - // current implemention supports only 1 hybrid cost per object + // current implemention supports reduce from left to right hybrid cost without cost parts announce MonoHybridManaCost mono = (MonoHybridManaCost) manaCost; int colorless = mono.getOptions().get(1).getGeneric(); if (restToReduce != 0 && colorless > 0) {