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

Merge pull request #2908 from Northmoc/i+e

Browse Source 
MOM: inga_and_esika.txt + support
This commit is contained in:
Northmoc
2023-04-13 10:10:50 -04:00
committed by GitHub
parent d90bfb0504 5a9faae08e
commit e89d4f0d67
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,18 +254,26 @@ public class ForgeScript {
int y = AbilityUtils.calculateAmount(source, k[1].substring(2), spellAbility);
return Expressions.compare(sa.getTotalManaSpent(), comparator, y);
} else if (property.startsWith("ManaFrom")) {
final String fromWhat = property.substring(8);
boolean found = false;
String fromWhat = property.substring(8);
String[] parts = null;
if (fromWhat.contains("_")) {
parts = fromWhat.split("_");
fromWhat = parts[0];
}
int toFind = parts != null ? AbilityUtils.calculateAmount(source, parts[1], spellAbility) : 1;
int found = 0;
for (Mana m : sa.getPayingMana()) {
final Card manaSource = m.getSourceCard();
if (manaSource != null) {
if (manaSource.isValid(fromWhat, sourceController, source, spellAbility)) {
found = true;
break;
found++;
if (found == toFind) {
break;
}
}
}
}
return found;
return (found == toFind);
} else if (property.equals("MayPlaySource")) {
StaticAbility m = sa.getMayPlay();
if (m == null) {