Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[M3C] Implement Ulalek, Fused Atrocity and new colorless hybrid mana (#12273)

Browse source 
* improved by (#12415)
* Added symbol downloads for new colorless hybrid
---------

Co-authored-by: Alexander Novotny <alexander_novo@mail.tmcc.edu>
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
This commit is contained in:
Evan Kranzler 2024-06-06 15:43:45 -04:00 • committed by GitHub
parent 1b2de47e78
commit 27bea843a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 306 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/util/ManaUtil.java
View file

@ -261,6 +261,9 @@ public final class ManaUtil {
} else if (symbols.contains(ManaSymbol.HYBRID_WB)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_WB);
} else if (symbols.contains(ManaSymbol.HYBRID_CB)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_CB);
}
}
@ -282,6 +285,9 @@ public final class ManaUtil {
} else if (symbols.contains(ManaSymbol.HYBRID_UR)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_UR);
} else if (symbols.contains(ManaSymbol.HYBRID_CR)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_CR);
}
}
return chosenManaAbilityForHybrid;
@ -302,6 +308,9 @@ public final class ManaUtil {
} else if (symbols.contains(ManaSymbol.HYBRID_GU)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_GU);
} else if (symbols.contains(ManaSymbol.HYBRID_CU)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_CU);
}
}
return chosenManaAbilityForHybrid;
@ -322,6 +331,9 @@ public final class ManaUtil {
} else if (symbols.contains(ManaSymbol.HYBRID_RW)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_RW);
} else if (symbols.contains(ManaSymbol.HYBRID_CW)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_CW);
}
}
return chosenManaAbilityForHybrid;
@ -342,6 +354,9 @@ public final class ManaUtil {
} else if (symbols.contains(ManaSymbol.HYBRID_RG)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_RG);
} else if (symbols.contains(ManaSymbol.HYBRID_CG)) {
chosenManaAbilityForHybrid = ability;
countColored.add(ManaSymbol.HYBRID_CG);
}
}
return chosenManaAbilityForHybrid;